diff options
author | Thorsten Behrens <tbehrens@suse.com> | 2013-03-11 20:21:57 +0100 |
---|---|---|
committer | Thorsten Behrens <tbehrens@suse.com> | 2013-03-25 00:52:11 +0100 |
commit | 6f8cf107a16858b13d05f2f4ba9cf29522f2111f (patch) | |
tree | 481435c9c065ab11825382bce23942a8a6b556c1 | |
parent | 0d82b464ba765ee17623ba691e1e740d30cacdc7 (diff) |
re-base preseng.js on ALv2 code.
Change-Id: I0dde612f0e2e1dbe5e7a28444e19137b76e29036
-rw-r--r-- | filter/source/svg/presentation_engine.js | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/filter/source/svg/presentation_engine.js b/filter/source/svg/presentation_engine.js index a77e7922c64f..72173f7dbffe 100644 --- a/filter/source/svg/presentation_engine.js +++ b/filter/source/svg/presentation_engine.js @@ -878,28 +878,21 @@ PriorityQueue.prototype.implPushHeap = function( nFirst, nHoleIndex, nTopIndex, /***** ****************************************************************** * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This file is part of the LibreOffice project. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * 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/. * - * OpenOffice.org - a multi-platform office productivity suite + * This file incorporates work covered by the following license notice: * - * 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 . * ************************************************************************/ @@ -917,8 +910,10 @@ PriorityQueue.prototype.implPushHeap = function( nFirst, nHoleIndex, nTopIndex, * @libreofficestart * * Several parts of the following code are the result of the porting, - * started on August 2011, of the C++ code included in the source files - * placed under the folder '/slideshow/source' and subfolders. + * started on August 2011, of the C++ code included in the source + * files placed under the folder '/slideshow/source' and + * subfolders. This got later rebased onto the AL2-licensed versions + * of those files in early 2013. * @source http://cgit.freedesktop.org/libreoffice/core/tree/slideshow/source * */ |