diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 08:04:28 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 08:04:28 +0000 |
commit | 87c6646b19ddebc94278167d21b87ff2abac4336 (patch) | |
tree | 7b779bbfe0c8595f4ed5cd73e12a4f5d57188647 /framework/source/uielement/addonstoolbarwrapper.cxx | |
parent | INTEGRATION: CWS changefileheader (1.16.96); FILE MERGED (diff) | |
download | core-87c6646b19ddebc94278167d21b87ff2abac4336.tar.gz core-87c6646b19ddebc94278167d21b87ff2abac4336.zip |
INTEGRATION: CWS changefileheader (1.6.262); FILE MERGED
2008/04/01 15:18:47 thb 1.6.262.3: #i85898# Stripping all external header guards
2008/04/01 10:58:15 thb 1.6.262.2: #i85898# Stripping all external header guards
2008/03/28 15:35:32 rt 1.6.262.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'framework/source/uielement/addonstoolbarwrapper.cxx')
-rw-r--r-- | framework/source/uielement/addonstoolbarwrapper.cxx | 83 |
1 files changed, 18 insertions, 65 deletions
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index a4d75788f993..9ffe200c9014 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: addonstoolbarwrapper.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.6 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: obo $ $Date: 2006-09-16 14:17:29 $ + * $RCSfile: addonstoolbarwrapper.cxx,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. * ************************************************************************/ @@ -41,29 +36,12 @@ //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_UIELEMENT_ADDONSTOOLBARWRAPPER_HXX_ #include <uielement/addonstoolbarwrapper.hxx> -#endif - -#ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ #include <threadhelp/resetableguard.hxx> -#endif - -#ifndef __FRAMEWORK_HELPER_ACTIONTRIGGERHELPER_HXX_ #include <helper/actiontriggerhelper.hxx> -#endif - -#ifndef __FRAMEWORK_UIELEMENT_CONSTITEMCONTAINER_HXX_ #include <uielement/constitemcontainer.hxx> -#endif - -#ifndef __FRAMEWORK_UIELEMENT_ROOTITEMCONTAINER_HXX_ #include <uielement/rootitemcontainer.hxx> -#endif - -#ifndef __FRAMEWORK_UIELEMENT_ADDONSTOOLBARMANAGER_HXX_ #include <uielement/addonstoolbarmanager.hxx> -#endif #ifndef __FRAMEWORK_UIELEMENT_TOOLBARW_HXX_ #include <uielement/toolbar.hxx> @@ -72,34 +50,13 @@ //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ - -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif - -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif - -#ifndef _COM_SUN_STAR_AWT_XSYSTEMDEPENDENTMENUPEER_HPP_ #include <com/sun/star/awt/XSystemDependentMenuPeer.hpp> -#endif - -#ifndef _COM_SUN_STAR_AWT_XMENUBAR_HPP_ #include <com/sun/star/awt/XMenuBar.hpp> -#endif - -#ifndef _COM_SUN_STAR_CONTAINER_XINDEXCONTAINER_HPP_ #include <com/sun/star/container/XIndexContainer.hpp> -#endif - -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif - -#ifndef _COM_SUN_STAR_UI_UIELEMENTTYPE_HPP_ #include <com/sun/star/ui/UIElementType.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes @@ -108,12 +65,8 @@ #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> #endif -#ifndef _TOOLKIT_AWT_VCLXWINDOW_HXX_ #include <toolkit/awt/vclxwindow.hxx> -#endif -#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include <comphelper/processfactory.hxx> -#endif #include <svtools/miscopt.hxx> #include <vcl/svapp.hxx> |