From c4008ef54630b560792aa288437db1179ad96095 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 2 Oct 2012 14:13:40 +0100 Subject: 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. --- shell/inc/internal/fileextensions.hxx | 43 ++++++++++++++--------------------- 1 file changed, 17 insertions(+), 26 deletions(-) (limited to 'shell/inc/internal/fileextensions.hxx') diff --git a/shell/inc/internal/fileextensions.hxx b/shell/inc/internal/fileextensions.hxx index 23b782219848..5fdc36fbfc18 100644 --- a/shell/inc/internal/fileextensions.hxx +++ b/shell/inc/internal/fileextensions.hxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * 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 - * - * 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 . + */ #ifndef FILEEXTENSIONS_HXX_INCLUDED #define FILEEXTENSIONS_HXX_INCLUDED -- cgit