Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1225987 [4/4] - in /incubator/ooo/trunk/main:
 extras/source/misc_config/wizard/web/layouts/ filter/source/docbook/
 filter/source/xslt/common/ filter/source/xslt/export/common/
 filter/source/xslt/export/spreadsheetml/ filter/source/xslt/exp...
Date: Sat, 31 Dec 2011 00:11:45 -0000
To: ooo-commits@incubator.apache.org
From: arist@apache.org
Message-Id: <20111231001149.0D3682388993@eris.apache.org>

Modified: incubator/ooo/trunk/main/xmerge/source/htmlsoff/htmltosoff.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/xmerge/source/htmlsoff/htmltosoff.xsl?rev=1225987&r1=1225986&r2=1225987&view=diff
==============================================================================
--- incubator/ooo/trunk/main/xmerge/source/htmlsoff/htmltosoff.xsl (original)
+++ incubator/ooo/trunk/main/xmerge/source/htmlsoff/htmltosoff.xsl Sat Dec 31 00:11:42 2011
@@ -1,32 +1,26 @@
 <?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.
+<!--***********************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ ***********************************************************-->
+
 
- #*************************************************************************
- -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 			      xmlns:office="http://openoffice.org/2000/office"
 			      xmlns:style="http://openoffice.org/2000/style"

Modified: incubator/ooo/trunk/main/xmerge/source/htmlsoff/sofftohtml.xsl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/xmerge/source/htmlsoff/sofftohtml.xsl?rev=1225987&r1=1225986&r2=1225987&view=diff
==============================================================================
--- incubator/ooo/trunk/main/xmerge/source/htmlsoff/sofftohtml.xsl (original)
+++ incubator/ooo/trunk/main/xmerge/source/htmlsoff/sofftohtml.xsl Sat Dec 31 00:11:42 2011
@@ -1,30 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!--***********************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the 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.
 
--->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:style="http://openoffice.org/2000/style" xmlns:table="http://openoffice.org/2000/table" xmlns:text="http://openoffice.org/2000/text" xmlns:office="http://openoffice.org/2000/office" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 	<xsl:output method="xml" omit-xml-declaration="yes" indent="yes" encoding="ISO-8859-1"/>
 	<!--doctype-system=[<!ENTITY acirc "">] -->