diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-07-16 17:32:30 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-07-17 11:51:17 +0100 |
commit | 6eeb0942c35f07dfbadb13f35fc6aa3703dac945 (patch) | |
tree | b829ee2fb2d4de261e4bbdbc51cbe5934f3dd41e /oox/source/ppt/layoutfragmenthandler.cxx | |
parent | cf2d07fe8010bdef1e0f42d5b84c5d1b295a0485 (diff) |
re-base on ALv2 code. Includes:
retain presence of MPL licensed nssrenam.h symbol renamer.
Diffstat (limited to 'oox/source/ppt/layoutfragmenthandler.cxx')
-rw-r--r-- | oox/source/ppt/layoutfragmenthandler.cxx | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/oox/source/ppt/layoutfragmenthandler.cxx b/oox/source/ppt/layoutfragmenthandler.cxx index 2455daa6316a..465edc94f86f 100644 --- a/oox/source/ppt/layoutfragmenthandler.cxx +++ b/oox/source/ppt/layoutfragmenthandler.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * 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/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * 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 . + */ #include "comphelper/anytostring.hxx" #include "cppuhelper/exc_hlp.hxx" |