diff --git a/framework/test/typecfg/xml2xcd.cxx b/framework/test/typecfg/xml2xcd.cxx
index 2282129fed0d..48ac2a0854dc 100644
--- a/framework/test/typecfg/xml2xcd.cxx
+++ b/framework/test/typecfg/xml2xcd.cxx
@@ -1,35 +1,31 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: xml2xcd.cxx,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
- *  $Revision: 1.11 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 14:33:43 $
+ * $RCSfile: xml2xcd.cxx,v $
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * $Revision: 1.12 $
  *
+ * This file is part of OpenOffice.org.
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
 
@@ -44,62 +40,26 @@
 #include <tools/presys.h>
 #include <windows.h>
 #include <tools/postsys.h>
-
-#ifndef __FRAMEWORK_CLASSES_SERVICEMANAGER_HXX_
 #include <classes/servicemanager.hxx>
-#endif
-
-#ifndef __FRAMEWORK_CLASSES_FILTERCACHE_HXX_
 #include <classes/filtercache.hxx>
-#endif
-
-#ifndef __FRAMEWORK_MACROS_GENERIC_HXX_
 #include <macros/generic.hxx>
-#endif
-
-#ifndef __FRAMEWORK_MACROS_DEBUG_HXX_
 #include <macros/debug.hxx>
-#endif
-
-#ifndef __FRAMEWORK_SERVICES_H_
 #include <services.h>
-#endif
-
-#ifndef __FRAMEWORK_FILTERFLAGS_H_
 #include <filterflags.h>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  interface includes
 //_________________________________________________________________________________________________________________
-
-#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-
-#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
 #include <comphelper/processfactory.hxx>
-#endif
-
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
 #include <unotools/processfactory.hxx>
-#endif
-
-#ifndef _VOS_PROCESS_HXX_
 #include <vos/process.hxx>
-#endif
-
-#ifndef _RTL_USTRING_
 #include <rtl/ustring.hxx>
-#endif
-
-#ifndef _RTL_USTRBUF_HXX_
 #include <rtl/ustrbuf.hxx>
-#endif
 
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
@@ -563,68 +523,72 @@ void XCDGenerator::impl_generateXCD()
 void XCDGenerator::impl_generateCopyright()
 {
     m_aData.sBufferStandard.appendAscii( "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"                                );
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: xml2xcd.cxx,v $
- *
- *  $Revision: 1.11 $
- *
- *  last change: $Author: obo $ $Date: 2006-09-16 14:33:43 $
- *
- *  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
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: xml2xcd.cxx,v $
- *
- *  $Revision: 1.11 $
- *
- *  last change: $Author: obo $ $Date: 2006-09-16 14:33:43 $
- *
- *  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
- *
+    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( "\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" );
+    m_aData.sBufferStandard.appendAscii( "   it under the terms of the GNU Lesser General Public License version 3\n"  );
+    m_aData.sBufferStandard.appendAscii( "   only, as published by the Free Software Foundation.\n"                    );
+    m_aData.sBufferStandard.appendAscii( "\n"                                                                          );
+    m_aData.sBufferStandard.appendAscii( "   OpenOffice.org is distributed in the hope that it will be useful,\n"      );
+    m_aData.sBufferStandard.appendAscii( "   but WITHOUT ANY WARRANTY; without even the implied warranty of\n"         );
+    m_aData.sBufferStandard.appendAscii( "   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"          );
+    m_aData.sBufferStandard.appendAscii( "   GNU Lesser General Public License version 3 for more details\n"           );
+    m_aData.sBufferStandard.appendAscii( "   (a copy is included in the LICENSE file that accompanied this code).\n"   );
+    m_aData.sBufferStandard.appendAscii( "\n"                                                                          );
+    m_aData.sBufferStandard.appendAscii( "   You should have received a copy of the GNU Lesser General Public License\n");
+    m_aData.sBufferStandard.appendAscii( "   version 3 along with OpenOffice.org.  If not, see\n"                      );
+    m_aData.sBufferStandard.appendAscii( "   <http://www.openoffice.org/license.html>\n"                               );
+    m_aData.sBufferStandard.appendAscii( "   for a copy of the LGPLv3 License.\n"                                      );
+    m_aData.sBufferStandard.appendAscii( "\n"                                                                          );
+    m_aData.sBufferStandard.appendAscii( "-->\n"                                                                       );
+
+    if( m_aData.nVersionOutput >= DRAFT_SPLIT_VERSION )
+    {
+        m_aData.sBufferAdditional.appendAscii( "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"                                );
+        m_aData.sBufferAdditional.appendAscii( "<!-- \n"                                                                     );
+        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( "\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"  );
+        m_aData.sBufferAdditional.appendAscii( "  it under the terms of the GNU Lesser General Public License version 3\n"   );
+        m_aData.sBufferAdditional.appendAscii( "  only, as published by the Free Software Foundation.\n"                     );
+        m_aData.sBufferAdditional.appendAscii( "\n"                                                                          );
+        m_aData.sBufferAdditional.appendAscii( "  OpenOffice.org is distributed in the hope that it will be useful,\n"       );
+        m_aData.sBufferAdditional.appendAscii( "  but WITHOUT ANY WARRANTY; without even the implied warranty of\n"          );
+        m_aData.sBufferAdditional.appendAscii( "  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"           );
+        m_aData.sBufferAdditional.appendAscii( "  GNU Lesser General Public License version 3 for more details\n"            );
+        m_aData.sBufferAdditional.appendAscii( "  (a copy is included in the LICENSE file that accompanied this code).\n"    );
+        m_aData.sBufferAdditional.appendAscii( "\n"                                                                          );
+        m_aData.sBufferAdditional.appendAscii( "  You should have received a copy of the GNU Lesser General Public License\n");
+        m_aData.sBufferAdditional.appendAscii( "  version 3 along with OpenOffice.org.  If not, see\n"                       );
+        m_aData.sBufferAdditional.appendAscii( "  <http://www.openoffice.org/license.html>\n"                                );
+        m_aData.sBufferAdditional.appendAscii( "  for a copy of the LGPLv3 License.\n"                                       );
+        m_aData.sBufferAdditional.appendAscii( "\n"                                                                          );
+        m_aData.sBufferAdditional.appendAscii( "-->\n"                                                                       );
+    }
+}
+
 //*****************************************************************************************************************
 void XCDGenerator::impl_generateTypeTemplate()
 {