INTEGRATION: CWS changefileheader (1.4.8); FILE MERGED

2008/04/01 12:33:01 thb 1.4.8.2: #i85898# Stripping all external header guards
2008/03/31 13:31:47 rt 1.4.8.1: #i87441# Change license header to LPGL v3.

1 files changed, 21 insertions, 43 deletions

diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index 33836d2ad9e1..02001957dd90 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -1,72 +1,50 @@
-#ifndef REPORTDESIGN_API_REPORTDEFINITION_HXX
-#define REPORTDESIGN_API_REPORTDEFINITION_HXX
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: ReportDefinition.hxx,v $
- *
- *  $Revision: 1.6 $
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  last change: $Author: kz $ $Date: 2008-04-08 12:46:07 $
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * OpenOffice.org - a multi-platform office productivity suite
  *
+ * $RCSfile: ReportDefinition.hxx,v $
+ * $Revision: 1.7 $
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ * This file is part of OpenOffice.org.
  *
- *    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.
+ * 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.
  *
- *    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.
+ * 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).
  *
- *    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.
  *
  ************************************************************************/
 
-#ifndef _COM_SUN_STAR_REPORT_XREPORTDEFINITION_HPP_
+#ifndef REPORTDESIGN_API_REPORTDEFINITION_HXX
+#define REPORTDESIGN_API_REPORTDEFINITION_HXX
+
 #include <com/sun/star/report/XReportDefinition.hpp>
-#endif
-#ifndef _CPPUHELPER_COMPBASE10_HXX_
 #include <cppuhelper/compbase10.hxx>
-#endif
-#ifndef _CPPUHELPER_BASEMUTEX_HXX_
 #include <cppuhelper/basemutex.hxx>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#endif
 #include <com/sun/star/frame/XTitle.hpp>
 #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp>
 #include <com/sun/star/frame/XUntitledNumbers.hpp>
-#ifndef INCLUDED_CPPUHELPER_PROPERTYSETMIXIN_HXX
 #include <cppuhelper/propertysetmixin.hxx>
-#endif
 #include <comphelper/uno3.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
-#ifndef SVX_UNOMOD_HXX
 #include <svx/unomod.hxx>
-#endif
-#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATSSUPPLIER_HPP_
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#endif
 #include <com/sun/star/frame/XModule.hpp>
 #include "ReportHelperDefines.hxx"
 #include <boost/shared_ptr.hpp>