diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 10:19:17 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 10:19:17 +0000 |
commit | e3e0c140e700e71a78c5b30c94986363a6772212 (patch) | |
tree | 307faa54ad3d9ef5e3be17e9992f74227c36a59a /cppuhelper/inc | |
parent | 53d524ab6c770c53a73d842e4742717fafbb0052 (diff) |
INTEGRATION: CWS changefileheader (1.6.138); FILE MERGED
2008/04/01 10:54:25 thb 1.6.138.2: #i85898# Stripping all external header guards
2008/03/28 15:25:21 rt 1.6.138.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'cppuhelper/inc')
-rw-r--r-- | cppuhelper/inc/cppuhelper/implbase_ex.hxx | 50 |
1 files changed, 18 insertions, 32 deletions
diff --git a/cppuhelper/inc/cppuhelper/implbase_ex.hxx b/cppuhelper/inc/cppuhelper/implbase_ex.hxx index 130bf2cbaaeb..2428205651bf 100644 --- a/cppuhelper/inc/cppuhelper/implbase_ex.hxx +++ b/cppuhelper/inc/cppuhelper/implbase_ex.hxx @@ -1,57 +1,43 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: implbase_ex.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.6 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: kz $ $Date: 2005-10-05 14:27:57 $ + * $RCSfile: implbase_ex.hxx,v $ + * $Revision: 1.7 $ * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * 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. * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA + * 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). * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library 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 for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * 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. * ************************************************************************/ #ifndef _CPPUHELPER_IMPLBASE_EX_HXX_ #define _CPPUHELPER_IMPLBASE_EX_HXX_ -#ifndef _CPPUHELPER_WEAK_HXX_ #include <cppuhelper/weak.hxx> -#endif -#ifndef _CPPUHELPER_WEAKAGG_HXX_ #include <cppuhelper/weakagg.hxx> -#endif - -#ifndef _COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_ #include <com/sun/star/lang/XTypeProvider.hpp> -#endif // Despite the fact that the following include is not used in this header, it has to remain, // because it is expected by files including cppuhelper/implbaseN.hxx. // So maybe we can omit it some time in the future... -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif /* If you need to define implementation helper classes that deal with more than 12 interfaces, then use macros as follows, e.g. for 3 interfaces: |