From 42bdb1d4be3e3065acab165a41b3ba158fc84ca9 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 11 Apr 2008 06:12:56 +0000 Subject: INTEGRATION: CWS changefileheader (1.7.26); FILE MERGED 2008/04/01 16:03:01 thb 1.7.26.3: #i85898# Stripping all external header guards 2008/04/01 12:59:00 thb 1.7.26.2: #i85898# Stripping all external header guards 2008/03/31 13:07:32 rt 1.7.26.1: #i87441# Change license header to LPGL v3. --- UnoControls/source/base/registercontrols.cxx | 66 ++++++++-------------------- 1 file changed, 18 insertions(+), 48 deletions(-) (limited to 'UnoControls/source/base/registercontrols.cxx') diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx index e5e3dfba3f94..15eb0c70c613 100644 --- a/UnoControls/source/base/registercontrols.cxx +++ b/UnoControls/source/base/registercontrols.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: registercontrols.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.7 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2006-06-19 23:09:07 $ + * $RCSfile: registercontrols.cxx,v $ + * $Revision: 1.8 $ * - * 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. * ************************************************************************/ @@ -37,25 +32,11 @@ // includes of other projects //______________________________________________________________________________________________________________ -#ifndef _CPPUHELPER_FACTORY_HXX_ #include -#endif - -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_CONTAINER_XSET_HPP_ #include -#endif #include @@ -66,21 +47,10 @@ //============================================================================= // Add new include line to use new services. //============================================================================= -#ifndef _UNOCONTROLS_FRAMECONTROL_CTRL_HXX #include "framecontrol.hxx" -#endif - -#ifndef _UNOCONTROLS_PROGRESSBAR_CTRL_HXX #include "progressbar.hxx" -#endif - -#ifndef _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX #include "progressmonitor.hxx" -#endif - -#ifndef _UNOCONTROLS_STATUSINDICATOR_CTRL_HXX #include "statusindicator.hxx" -#endif //============================================================================= //______________________________________________________________________________________________________________ -- cgit v1.2.3