From 1a9d32431ed4845636527db2fdbe9d9c4a409317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 11 Apr 2008 06:37:19 +0000 Subject: [PATCH] INTEGRATION: CWS changefileheader (1.5.458); FILE MERGED 2008/04/01 15:18:28 thb 1.5.458.3: #i85898# Stripping all external header guards 2008/04/01 10:57:57 thb 1.5.458.2: #i85898# Stripping all external header guards 2008/03/28 15:34:56 rt 1.5.458.1: #i87441# Change license header to LPGL v3. --- .../inc/uielement/footermenucontroller.hxx | 85 ++++--------------- .../inc/uielement/headermenucontroller.hxx | 85 ++++--------------- 2 files changed, 36 insertions(+), 134 deletions(-) diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx index be0571cbfe45..a54c8f60f170 100644 --- a/framework/inc/uielement/footermenucontroller.hxx +++ b/framework/inc/uielement/footermenucontroller.hxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: footermenucontroller.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.5 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2005-09-09 00:43:12 $ + * $RCSfile: footermenucontroller.hxx,v $ + * $Revision: 1.6 $ * - * 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. * ************************************************************************/ @@ -40,73 +35,29 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_HELPER_POPUPMENUCONTROLLERBASE_HXX_ #include -#endif - -#ifndef __FRAMEWORK_STDTYPES_H_ #include -#endif //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ - -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_FRAME_XDISPATCH_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_FRAME_XSTATUSLISTENER_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_FRAME_XPOPUPMENUCONTROLLER_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_FRAME_STATUS_VERB_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ #include -#endif //_________________________________________________________________________________________________________________ // includes of other projects //_________________________________________________________________________________________________________________ - -#ifndef _TOOLKIT_AWT_VCLXMENU_HXX_ #include -#endif - -#ifndef _CPPUHELPER_WEAK_HXX_ #include -#endif - -#ifndef _RTL_USTRING_HXX_ #include -#endif namespace framework { diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx index b97c547d48a8..ade3b34bc80a 100644 --- a/framework/inc/uielement/headermenucontroller.hxx +++ b/framework/inc/uielement/headermenucontroller.hxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: headermenucontroller.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.5 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2005-09-09 00:43:43 $ + * $RCSfile: headermenucontroller.hxx,v $ + * $Revision: 1.6 $ * - * 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. * ************************************************************************/ @@ -40,73 +35,29 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_HELPER_POPUPMENUCONTROLLERBASE_HXX_ #include -#endif - -#ifndef __FRAMEWORK_STDTYPES_H_ #include -#endif //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ - -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_FRAME_XDISPATCH_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_FRAME_XSTATUSLISTENER_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_FRAME_XPOPUPMENUCONTROLLER_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_FRAME_STATUS_VERB_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ #include -#endif //_________________________________________________________________________________________________________________ // includes of other projects //_________________________________________________________________________________________________________________ - -#ifndef _TOOLKIT_AWT_VCLXMENU_HXX_ #include -#endif - -#ifndef _CPPUHELPER_WEAK_HXX_ #include -#endif - -#ifndef _RTL_USTRING_HXX_ #include -#endif namespace framework {