diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-11-19 19:45:04 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-21 14:52:11 +0000 |
commit | f78a2bcce88dd5c12052ae3e55c561cdd48b05fe (patch) | |
tree | e56530808fd0e0ec6cfa1eb58339c8cd467854f0 /xmlhelp/util | |
parent | Revert "sb140: sb140: #i116981# clean up memory upon exit" (diff) | |
download | core-f78a2bcce88dd5c12052ae3e55c561cdd48b05fe.tar.gz core-f78a2bcce88dd5c12052ae3e55c561cdd48b05fe.zip |
re-base on ALv2 code. Includes:
Patch contributed by Herbert Duerr:
#i118662# remove berkeleyDB from module xmlhelp (author=orwitt)
http://svn.apache.org/viewvc?view=revision&revision=1213188
#i119141# remove ISCII converter for now
http://svn.apache.org/viewvc?view=revision&revision=1306246
make exceptions for cppunittester verbose
http://svn.apache.org/viewvc?view=revision&revision=1174831
Patches contributed by Pedro Giffuni:
Avoid some uses of non portable #!/bin/bash in shell scripts.
http://svn.apache.org/viewvc?view=revision&revision=1235297
Patch contributed by Oliver-Rainer Wittmann
88652: applied patch, remove unicows deps
http://svn.apache.org/viewvc?view=revision&revision=1177585
drop OS/2 code, remove in-line assembler ARM atomics,
and obsolete armarch header.
Diffstat (limited to 'xmlhelp/util')
-rw-r--r-- | xmlhelp/util/embed.xsl | 17 | ||||
-rw-r--r-- | xmlhelp/util/idxcaption.xsl | 19 | ||||
-rw-r--r-- | xmlhelp/util/idxcontent.xsl | 19 | ||||
-rw-r--r-- | xmlhelp/util/main_transform.xsl | 42 | ||||
-rw-r--r-- | xmlhelp/util/ucpchelp.xml | 18 | ||||
-rw-r--r-- | xmlhelp/util/ucpchelp1.component | 43 |
6 files changed, 103 insertions, 55 deletions
diff --git a/xmlhelp/util/embed.xsl b/xmlhelp/util/embed.xsl index 3a4e3ef80f61..a611e4dbcbc0 100644 --- a/xmlhelp/util/embed.xsl +++ b/xmlhelp/util/embed.xsl @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * 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 . +--> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:output indent="yes" method="xml"/> diff --git a/xmlhelp/util/idxcaption.xsl b/xmlhelp/util/idxcaption.xsl index 7570fa5c7870..08f09d70cefc 100644 --- a/xmlhelp/util/idxcaption.xsl +++ b/xmlhelp/util/idxcaption.xsl @@ -1,3 +1,20 @@ +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * 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 . +--> <xsl:stylesheet version="1.0" encoding="UTF-8" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:office="http://openoffice.org/2000/office" @@ -12,7 +29,7 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:help="http://openoffice.org/2000/help" - xmlns:index="http://sun.com/2000/XMLSearch" + xmlns:index="http://sun.com/2000/XMLSearch" xmlns:text="http://openoffice.org/2000/text"> <xsl:param name="Language" select="'en-US'"/> diff --git a/xmlhelp/util/idxcontent.xsl b/xmlhelp/util/idxcontent.xsl index cfc16ea7e6a6..c09e04500f71 100644 --- a/xmlhelp/util/idxcontent.xsl +++ b/xmlhelp/util/idxcontent.xsl @@ -1,3 +1,20 @@ +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * 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 . +--> <xsl:stylesheet version="1.0" encoding="UTF-8" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:office="http://openoffice.org/2000/office" @@ -12,7 +29,7 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:help="http://openoffice.org/2000/help" - xmlns:index="http://sun.com/2000/XMLSearch" + xmlns:index="http://sun.com/2000/XMLSearch" xmlns:text="http://openoffice.org/2000/text"> <xsl:param name="Language" select="'en-US'"/> diff --git a/xmlhelp/util/main_transform.xsl b/xmlhelp/util/main_transform.xsl index bb6136981d8c..0a612fc3748a 100644 --- a/xmlhelp/util/main_transform.xsl +++ b/xmlhelp/util/main_transform.xsl @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> - <!--*********************************************************************** This is the main transformation style sheet for transforming. - Only use with OOo 2.0 + For use with LibreOffice 4.0+ ========================================================================= Changes Log May 24 2004 Created @@ -28,30 +27,21 @@ ***********************************************************************//--> <!-- - - 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 part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * 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 . --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> diff --git a/xmlhelp/util/ucpchelp.xml b/xmlhelp/util/ucpchelp.xml index 7897b0db8151..fd8d5fcd8e0c 100644 --- a/xmlhelp/util/ucpchelp.xml +++ b/xmlhelp/util/ucpchelp.xml @@ -1,5 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd"> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * 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 . +--> <module-description xmlns:xlink="http://www.w3.org/1999/xlink"> <module-name> @@ -42,7 +59,6 @@ <project-build-dependency> external </project-build-dependency> <project-build-dependency> XmlSearch </project-build-dependency> <project-build-dependency> ucbhelper </project-build-dependency> - <project-build-dependency> berkeleydb </project-build-dependency> <runtime-module-dependency> sal3 </runtime-module-dependency> <runtime-module-dependency> cppu3 </runtime-module-dependency> diff --git a/xmlhelp/util/ucpchelp1.component b/xmlhelp/util/ucpchelp1.component index a8bb64124e9c..1642ae74e3eb 100644 --- a/xmlhelp/util/ucpchelp1.component +++ b/xmlhelp/util/ucpchelp1.component @@ -1,30 +1,21 @@ <?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 part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * 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 . + --> <component loader="com.sun.star.loader.SharedLibrary" xmlns="http://openoffice.org/2010/uno-components"> |