INTEGRATION: CWS changefileheader (1.5.318); FILE MERGED

2008/04/01 15:18:30 thb 1.5.318.3: #i85898# Stripping all external header guards
2008/04/01 10:57:59 thb 1.5.318.2: #i85898# Stripping all external header guards
2008/03/28 15:34:58 rt 1.5.318.1: #i87441# Change license header to LPGL v3.
This commit is contained in:
Rüdiger Timm 2008-04-11 06:46:19 +00:00
parent 58aeb863dd
commit d2246a2c92
2 changed files with 36 additions and 134 deletions

View file

@ -1,35 +1,30 @@
/************************************************************************* /*************************************************************************
* *
* OpenOffice.org - a multi-platform office productivity suite * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* $RCSfile: menubarfactory.hxx,v $ * Copyright 2008 by Sun Microsystems, Inc.
* *
* $Revision: 1.5 $ * OpenOffice.org - a multi-platform office productivity suite
* *
* last change: $Author: hr $ $Date: 2006-06-19 11:06:56 $ * $RCSfile: menubarfactory.hxx,v $
* $Revision: 1.6 $
* *
* The Contents of this file are made available subject to * This file is part of OpenOffice.org.
* the terms of GNU Lesser General Public License Version 2.1.
* *
* 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 * OpenOffice.org is distributed in the hope that it will be useful,
* ============================================= * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Copyright 2005 by Sun Microsystems, Inc. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* 901 San Antonio Road, Palo Alto, CA 94303, USA * 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 * You should have received a copy of the GNU Lesser General Public License
* modify it under the terms of the GNU Lesser General Public * version 3 along with OpenOffice.org. If not, see
* License version 2.1, as published by the Free Software Foundation. * <http://www.openoffice.org/license.html>
* * for a copy of the LGPLv3 License.
* 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
* *
************************************************************************/ ************************************************************************/
@ -40,73 +35,29 @@
// my own includes // my own includes
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
#ifndef __FRAMEWORK_STDTYPES_H_
#include <stdtypes.h> #include <stdtypes.h>
#endif
#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
#include <threadhelp/threadhelpbase.hxx> #include <threadhelp/threadhelpbase.hxx>
#endif
#ifndef __FRAMEWORK_MACROS_GENERIC_HXX_
#include <macros/generic.hxx> #include <macros/generic.hxx>
#endif
#ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_
#include <macros/xinterface.hxx> #include <macros/xinterface.hxx>
#endif
#ifndef __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_
#include <macros/xtypeprovider.hxx> #include <macros/xtypeprovider.hxx>
#endif
#ifndef __FRAMEWORK_MACROS_XSERVICEINFO_HXX_
#include <macros/xserviceinfo.hxx> #include <macros/xserviceinfo.hxx>
#endif
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
// interface includes // interface includes
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#endif
#ifndef _COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_
#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XTypeProvider.hpp>
#endif
#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#endif
#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp>
#endif
#ifndef _COM_SUN_STAR_UI_XUIELEMENTFACTORY_HPP_
#include <com/sun/star/ui/XUIElementFactory.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp>
#endif
#ifndef _COM_SUN_STAR_FRAME_XMODULEMANAGER_HPP_
#include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/frame/XModuleManager.hpp>
#endif
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
// includes of other projects // includes of other projects
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
#ifndef _TOOLKIT_AWT_VCLXMENU_HXX_
#include <toolkit/awt/vclxmenu.hxx> #include <toolkit/awt/vclxmenu.hxx>
#endif
#ifndef _CPPUHELPER_WEAK_HXX_
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#endif
#ifndef _RTL_USTRING_HXX_
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#endif
namespace framework namespace framework
{ {

View file

@ -1,35 +1,30 @@
/************************************************************************* /*************************************************************************
* *
* OpenOffice.org - a multi-platform office productivity suite * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* $RCSfile: statusbarfactory.hxx,v $ * Copyright 2008 by Sun Microsystems, Inc.
* *
* $Revision: 1.5 $ * OpenOffice.org - a multi-platform office productivity suite
* *
* last change: $Author: hr $ $Date: 2006-06-19 11:07:35 $ * $RCSfile: statusbarfactory.hxx,v $
* $Revision: 1.6 $
* *
* The Contents of this file are made available subject to * This file is part of OpenOffice.org.
* the terms of GNU Lesser General Public License Version 2.1.
* *
* 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 * OpenOffice.org is distributed in the hope that it will be useful,
* ============================================= * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Copyright 2005 by Sun Microsystems, Inc. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* 901 San Antonio Road, Palo Alto, CA 94303, USA * 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 * You should have received a copy of the GNU Lesser General Public License
* modify it under the terms of the GNU Lesser General Public * version 3 along with OpenOffice.org. If not, see
* License version 2.1, as published by the Free Software Foundation. * <http://www.openoffice.org/license.html>
* * for a copy of the LGPLv3 License.
* 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
* *
************************************************************************/ ************************************************************************/
@ -40,73 +35,29 @@
// my own includes // my own includes
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
#ifndef __FRAMEWORK_STDTYPES_H_
#include <stdtypes.h> #include <stdtypes.h>
#endif
#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
#include <threadhelp/threadhelpbase.hxx> #include <threadhelp/threadhelpbase.hxx>
#endif
#ifndef __FRAMEWORK_MACROS_GENERIC_HXX_
#include <macros/generic.hxx> #include <macros/generic.hxx>
#endif
#ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_
#include <macros/xinterface.hxx> #include <macros/xinterface.hxx>
#endif
#ifndef __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_
#include <macros/xtypeprovider.hxx> #include <macros/xtypeprovider.hxx>
#endif
#ifndef __FRAMEWORK_MACROS_XSERVICEINFO_HXX_
#include <macros/xserviceinfo.hxx> #include <macros/xserviceinfo.hxx>
#endif
#ifndef __FRAMEWORK_SERVICES_H_
#include <services.h> #include <services.h>
#endif
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
// interface includes // interface includes
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#endif
#ifndef _COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_
#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XTypeProvider.hpp>
#endif
#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#endif
#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp>
#endif
#ifndef _COM_SUN_STAR_UI_XUIELEMENTFACTORY_HPP_
#include <com/sun/star/ui/XUIElementFactory.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp>
#endif
#ifndef _COM_SUN_STAR_FRAME_XMODULEMANAGER_HPP_
#include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/frame/XModuleManager.hpp>
#endif
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
// includes of other projects // includes of other projects
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
#ifndef _CPPUHELPER_WEAK_HXX_
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#endif
#ifndef _RTL_USTRING_HXX_
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#endif
namespace framework namespace framework
{ {