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/multiplexer.cxx

@@ -1,52 +1,42 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: multiplexer.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:08:53 $
+ * $RCSfile: multiplexer.cxx,v $
+ * $Revision: 1.8 $
  *
- *  The Contents of this file are made available subject to
+ * This file is part of OpenOffice.org.
- *  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.
  *
- *    GNU Lesser General Public License Version 2.1
+ * OpenOffice.org is distributed in the hope that it will be useful,
- *    =============================================
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    Copyright 2005 by Sun Microsystems, Inc.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ * 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
+ * You should have received a copy of the GNU Lesser General Public License
- *    modify it under the terms of the GNU Lesser General Public
+ * version 3 along with OpenOffice.org.  If not, see
- *    License version 2.1, as published by the Free Software Foundation.
+ * <http://www.openoffice.org/license.html>
- *
+ * for a copy of the LGPLv3 License.
- *    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
  *
  ************************************************************************/
 //____________________________________________________________________________________________________________
 //  my own include
 //____________________________________________________________________________________________________________
 
-#ifndef _UNOCONTROLS_MULTIPLEXER_HXX
 #include "multiplexer.hxx"
-#endif
 
 //____________________________________________________________________________________________________________
 //  includes of other projects
 //____________________________________________________________________________________________________________
-
-#ifndef _VOS_DIAGNOSE_H_
 #include <vos/diagnose.hxx>
-#endif
 
 //____________________________________________________________________________________________________________
 //  includes of my own project

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
+ * This file is part of OpenOffice.org.
- *  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.
  *
- *    GNU Lesser General Public License Version 2.1
+ * OpenOffice.org is distributed in the hope that it will be useful,
- *    =============================================
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    Copyright 2005 by Sun Microsystems, Inc.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ * 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
+ * You should have received a copy of the GNU Lesser General Public License
- *    modify it under the terms of the GNU Lesser General Public
+ * version 3 along with OpenOffice.org.  If not, see
- *    License version 2.1, as published by the Free Software Foundation.
+ * <http://www.openoffice.org/license.html>
- *
+ * for a copy of the LGPLv3 License.
- *    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
  *
  ************************************************************************/
 
@@ -37,25 +32,11 @@
 //  includes of other projects
 //______________________________________________________________________________________________________________
 
-#ifndef _CPPUHELPER_FACTORY_HXX_
 #include <cppuhelper/factory.hxx>
-#endif
-
-#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_
 #include <com/sun/star/registry/XRegistryKey.hpp>
-#endif
-
-#ifndef _COM_SUN_STAR_CONTAINER_XSET_HPP_
 #include <com/sun/star/container/XSet.hpp>
-#endif
 
 #include <stdio.h>
 
@@ -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
 //=============================================================================
 
 //______________________________________________________________________________________________________________