diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-11-27 16:10:40 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-28 12:48:36 +0000 |
| commit | 837e2808f7ed0ef7e40f2596a7a1781b52b606a2 (patch) | |
| tree | 87706132ea2c25c4cd185fb7d83485cca5775ebb /sd/source/filter/sdfilter.cxx | |
| parent | 6d2fa52272e3418d1c6baa64e75ee45ad1ff6172 (diff) | |
re-base on ALv2 code. Includes:
Patches contributed by Armin Le-Grand
#118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles...
http://svn.apache.org/viewvc?view=revision&revision=1293316
#118485# - Styles for OLEs are not saved.
http://svn.apache.org/viewvc?view=revision&revision=1182166
Patches contributed by Andre Fischer
http://svn.apache.org/viewvc?view=revision&revision=1172128
http://svn.apache.org/viewvc?view=revision&revision=1172133
Patch contributed by Ariel Constenla-Haile
i#118505# - Remove MN_OLE_OBJECT menu item from Draw/Impress
contextmenu - CWS contextmenu1
http://svn.apache.org/viewvc?view=revision&revision=1182915
Patch contributed by Zhang Jian Fang
#118876#, Add check if the OutlinerParaObject is created successfully
http://svn.apache.org/viewvc?view=revision&revision=1243381
restore a re-based rdbedit.
Diffstat (limited to 'sd/source/filter/sdfilter.cxx')
| -rw-r--r-- | sd/source/filter/sdfilter.cxx | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index d379ffd1780f..e835e25d1815 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.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 <com/sun/star/task/XStatusIndicatorFactory.hpp> |