diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-12-05 11:46:50 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-12-06 09:12:57 +0000 |
commit | 9d7c1dcbbbce69bebec54d85004a0da5074775cd (patch) | |
tree | 52639b3d85144f7f569ae280ab1c4bd608ee2789 /sccomp/source | |
parent | c95f6b679a548f7b79d10005b0415d7a0233e4b4 (diff) |
re-base on ALv2 code. Includes:
Patches contributed by Ocke Janssen
converted reportdesign.
http://svn.apache.org/viewvc?view=revision&revision=1396797
http://svn.apache.org/viewvc?view=revision&revision=1394326
Patch contributed by Oliver Rainer-Wittmann
sw34bf06: #i117783# - Writer's implementation of XPagePrintable -
apply print settings to new printing routines
http://svn.apache.org/viewvc?view=revision&revision=1172115
Diffstat (limited to 'sccomp/source')
-rw-r--r-- | sccomp/source/solver/solver.component | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/sccomp/source/solver/solver.component b/sccomp/source/solver/solver.component index 6099ab96402f..f6c34906ca32 100644 --- a/sccomp/source/solver/solver.component +++ b/sccomp/source/solver/solver.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="solver" xmlns="http://openoffice.org/2010/uno-components"> |