diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-10-02 14:13:40 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-10-03 16:56:06 +0100 |
| commit | c4008ef54630b560792aa288437db1179ad96095 (patch) | |
| tree | 53a568a3d143490a341fe546bb08438d59e35ac6 /toolkit/source/awt/vclxbitmap.cxx | |
| parent | 258548ca8116a233e91900709ed7ce7ef1804ecd (diff) | |
re-base on ALv2 code. Includes:
tkr41: #117828# office crash fixed . (null pointer) + add unit test
Patch contributed by Tobias Krause
http://svn.apache.org/viewvc?view=revision&revision=1172105
Do not add targets for junit tests when junit is disabled.
Patch contributed by Andre Fischer
http://svn.apache.org/viewvc?view=revision&revision=1241508
remove the OutDev::GetKernPair* stubs completely
Patch contributed by Herbert Duerr
http://svn.apache.org/viewvc?view=revision&revision=1179221
reverting un-necessary OS/2 conditionals.
Diffstat (limited to 'toolkit/source/awt/vclxbitmap.cxx')
| -rw-r--r-- | toolkit/source/awt/vclxbitmap.cxx | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx index 773b69a7e4a4..fd9b5aea22a8 100644 --- a/toolkit/source/awt/vclxbitmap.cxx +++ b/toolkit/source/awt/vclxbitmap.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 <toolkit/awt/vclxbitmap.hxx> #include <toolkit/helper/macros.hxx> |