diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-07-11 09:51:50 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-07-11 18:12:35 +0100 |
commit | 535e83550e2874c8881a72e3520e8eac0309b537 (patch) | |
tree | 5b3fbca81caba8a8ad7eb22873b736eb47553595 /unotools/util | |
parent | de3d6883f2a8fe9c5c04b8e271a36423f96950bb (diff) |
re-base on ALv2 code. Includes:
Avoid some uses of non portable #!/bin/bash in shell scripts.
Patch contributed by Pedro Giffuni
http://svn.apache.org/viewvc?view=revision&revision=1235297
remove redundant namespace, patch contributed Mathias Bauer
http://svn.apache.org/viewvc?view=revision&revision=1162610
removal of OS/2 port changes, and preferring our similiar
tools/inc/tools/solar.h DLLPOSTFIX cleanup.
i118595 - Removal of the use of getopt() from rscdep.
Patch contributed by Andre Fische
http://svn.apache.org/viewvc?view=revision&revision=1202270
Diffstat (limited to 'unotools/util')
-rw-r--r-- | unotools/util/utl.component | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/unotools/util/utl.component b/unotools/util/utl.component index ab4b67b61da4..72e475753a23 100644 --- a/unotools/util/utl.component +++ b/unotools/util/utl.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" prefix="utl" xmlns="http://openoffice.org/2010/uno-components"> |