From b6a1a56a23ab6b2547bfa4cf7c02914dd51627d7 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 11 Apr 2008 08:13:13 +0000 Subject: INTEGRATION: CWS changefileheader (1.50.80); FILE MERGED 2008/04/01 15:18:49 thb 1.50.80.3: #i85898# Stripping all external header guards 2008/04/01 10:58:15 thb 1.50.80.2: #i85898# Stripping all external header guards 2008/03/28 15:35:35 rt 1.50.80.1: #i87441# Change license header to LPGL v3. --- framework/source/uielement/menubarmanager.cxx | 132 ++++---------------------- 1 file changed, 19 insertions(+), 113 deletions(-) diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index ffb35b198e..cdd1ef8835 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. * - * $RCSfile: menubarmanager.cxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.50 $ + * $RCSfile: menubarmanager.cxx,v $ + * $Revision: 1.51 $ * - * last change: $Author: ihi $ $Date: 2007-11-23 16:48:13 $ + * This file is part of OpenOffice.org. * - * The Contents of this file are made available subject to - * 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. * + * 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). * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * 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 + * + * for a copy of the LGPLv3 License. * ************************************************************************/ @@ -40,157 +35,68 @@ //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ - -#ifndef __FRAMEWORK_UIELEMENT_MENUBARMANAGER_HXX_ #include -#endif -#ifndef __FRAMEWORK_CLASSES_MENUCONFIGURATION_HXX_ #include -#endif -#ifndef __FRAMEWORK_CLASSES_BMKMENU_HXX #include -#endif -#ifndef __FRAMEWORK_CLASSES_ADDONMENU_HXX_ #include -#endif -#ifndef __FRAMEWORK_HELPER_IMAGEPRODUCER_HXX_ #include -#endif -#ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ #include -#endif -#ifndef __FRAMEWORK_CLASSES_ADDONSOPTIONS_HXX_ #include "classes/addonsoptions.hxx" -#endif -#ifndef __FRAMEWORK_CLASSES_FWKRESID_HXX_ #include -#endif -#ifndef __FRAMEWORK_HELPER_ACCELERATORINFO_HXX_ #include -#endif -#ifndef __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_ #include -#endif #include -#ifndef __FRAMEWORK_SERVICES_H_ #include -#endif //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ - -#ifndef _COM_SUN_STAR_FRAME_XDISPATCH_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XFRAMESSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XDESKTOP_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XENUMERATION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XSTRINGWIDTH_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTICOMPONENTFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XPOPUPMENUCONTROLLER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XUICONTROLLERREGISTRATION_HPP_ #include -#endif #ifndef _COM_SUN_STAR_LANG_XSYSTEMDEPENDENT_HPP_ #include #endif -#ifndef _COM_SUN_STAR_UI_ITEMTYPE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UI_IMAGETYPE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLECOMPONENTFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XMODULEMANAGER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UI_XMODULEUICONFIGURATIONMANAGERSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_STATUS_VISIBILITY_HPP_ #include -#endif //_________________________________________________________________________________________________________________ // includes of other projects //_________________________________________________________________________________________________________________ - -#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include -#endif #include -#ifndef INCLUDED_SVTOOLS_MENUOPTIONS_HXX #include -#endif -#ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX #include -#endif -#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX #include -#endif -#ifndef INCLUDED_SVTOOLS_CMDOPTIONS_HXX #include -#endif -#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX #include -#endif #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include #endif -#ifndef _URLOBJ_HXX #include -#endif #include #include #include -#ifndef _SV_SVAPP_HXX #include -#endif -#ifndef _OSL_FILE_HXX_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif -#ifndef INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX #include -#endif -#ifndef _RTL_LOGFILE_HXX_ #include -#endif -#ifndef INCLUDED_SVTOOLS_MISCOPT_HXX #include "svtools/miscopt.hxx" -#endif #include #include -- cgit v1.2.3