From 81f875eeb6f167facd9dc187675f531b3a805f75 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 11 Apr 2008 08:20:32 +0000 Subject: INTEGRATION: CWS changefileheader (1.19.80); FILE MERGED 2008/04/01 15:18:50 thb 1.19.80.3: #i85898# Stripping all external header guards 2008/04/01 10:58:17 thb 1.19.80.2: #i85898# Stripping all external header guards 2008/03/28 15:35:37 rt 1.19.80.1: #i87441# Change license header to LPGL v3. --- .../source/uielement/toolbarsmenucontroller.cxx | 88 +++++----------------- 1 file changed, 18 insertions(+), 70 deletions(-) diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index f93085074a73..c07b825789a4 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -1,107 +1,67 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: toolbarsmenucontroller.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.19 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: ihi $ $Date: 2007-11-19 17:24:45 $ + * $RCSfile: toolbarsmenucontroller.cxx,v $ + * $Revision: 1.20 $ * - * 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 + * + * for a copy of the LGPLv3 License. * ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" - -#ifndef __FRAMEWORK_UIELEMENT_TOOLBARSMENUCONTROLLER_HXX_ #include -#endif #include //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ - -#ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ #include -#endif -#ifndef __FRAMEWORK_SERVICES_H_ #include "services.h" -#endif #ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include #endif -#ifndef __FRAMEWORK_CLASSES_FWKRESID_HXX_ #include -#endif -#ifndef __FRAMEWORK_UICONFIGURATION_WINDOWSTATECONFIGURATION_HXX_ #include -#endif -#ifndef __FRAMEWORK_HELPER_IMAGEPRODUCER_HXX_ #include -#endif -#ifndef __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_ #include -#endif //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ - -#ifndef _COM_SUN_STAR_AWT_XDEVICE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_AWT_MENUITEMSTYLE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XLAYOUTMANAGER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UI_XUIELEMENTSETTINGS_HPP_ #include -#endif #ifndef _COM_SUN_STAR_UI_XMODULEUICONFIGURATIONMANAGER_HPP_ #include #endif -#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPPLIER_HPP_ #include -#endif #ifndef _COM_SUN_STAR_UI_UIElementType_HPP_ #include #endif @@ -113,28 +73,16 @@ #ifndef _VCL_MENU_HXX_ #include #endif -#ifndef _SV_SVAPP_HXX #include -#endif -#ifndef _VCL_I18NHELP_HXX #include -#endif #include -#ifndef _URLOBJ_HXX #include -#endif -#ifndef _RTL_USTRBUF_HXX_ #include -#endif #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include #endif -#ifndef _SV_WINDOW_HXX #include -#endif -#ifndef INCLUDED_SVTOOLS_MENUOPTIONS_HXX #include -#endif #include //_________________________________________________________________________________________________________________ -- cgit