User: rt      
Date: 2008-04-10 18:38:49+0000
Modified:
   dba/reportdesign/source/filter/xml/xmlHelper.cxx

Log:
 INTEGRATION: CWS changefileheader (1.6.8); FILE MERGED
 2008/04/01 15:23:38 thb 1.6.8.3: #i85898# Stripping all external header guards
 2008/04/01 12:33:10 thb 1.6.8.2: #i85898# Stripping all external header guards
 2008/03/31 13:32:08 rt 1.6.8.1: #i87441# Change license header to LPGL v3.

File Changes:

Directory: /dba/reportdesign/source/filter/xml/
===============================================

File [changed]: xmlHelper.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlHelper.cxx?r1=1.6&r2=1.7
Delta lines:  +19 -73
---------------------
--- xmlHelper.cxx       2008-03-05 18:03:17+0000        1.6
+++ xmlHelper.cxx       2008-04-10 18:38:47+0000        1.7
@@ -1,119 +1,65 @@
 /*************************************************************************
  *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
  *  OpenOffice.org - a multi-platform office productivity suite
  *
  *  $RCSfile$
- *
  *  $Revision$
  *
- *  last change: $Author$ $Date$
- *
- *  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
- *
- *    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,
+ * 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 for more details.
+ * 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.
  *
  ************************************************************************/
 #include "precompiled_reportdesign.hxx"
-
-#ifndef RPT_XMLHELPER_HXX
 #include "xmlHelper.hxx"
-#endif
-#ifndef _XMLOFF_XMLNMSPE_HXX
 #include <xmloff/xmlnmspe.hxx>
-#endif
-#ifndef _XMLOFF_XMLTOKEN_HXX
 #include <xmloff/xmltoken.hxx>
-#endif
-#ifndef _XMLOFF_FAMILIES_HXX_
 #include <xmloff/families.hxx>
-#endif
 #include <connectivity/dbtools.hxx>
 #include <comphelper/propertysethelper.hxx>
 #include <comphelper/mediadescriptor.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/awt/TextAlign.hpp>
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_FONTDESCRIPTOR_HPP_
 #include <com/sun/star/awt/FontDescriptor.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_TEXTALIGN_HPP_
 #include <com/sun/star/awt/TextAlign.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_IMAGEPOSITION_HPP_
 #include <com/sun/star/awt/ImagePosition.hpp>
-#endif
-#ifndef _XMLOFF_PRSTYLEI_HXX_
 #include <xmloff/prstylei.hxx>
-#endif
 #include "xmlstrings.hrc"
-#ifndef RPT_XMLENUMS_HXX
 #include "xmlEnums.hxx"
-#endif
-#ifndef _XMLOFF_CONTEXTID_HXX_
 #include <xmloff/contextid.hxx>
-#endif
-#ifndef _XMLOFF_TEXTPRMAP_HXX_
 #include <xmloff/txtprmap.hxx>
-#endif
-#ifndef _COM_SUN_STAR_SDB_XOFFICEDATABASEDOCUMENT_HPP_
 #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
-#endif
 #include <com/sun/star/table/BorderLine.hpp>
-#ifndef _XMLOFF_XMLCONSTANTSPROPERTYHANDLER_HXX
 #include <xmloff/XMLConstantsPropertyHandler.hxx>
-#endif
-#ifndef _COM_SUN_STAR_REPORT_FORCENEWPAGE_HPP_
 #include <com/sun/star/report/ForceNewPage.hpp>
-#endif
-#ifndef _COM_SUN_STAR_REPORT_REPORTPRINTOPTION_HPP_
 #include <com/sun/star/report/ReportPrintOption.hpp>
-#endif
-#ifndef _COM_SUN_STAR_REPORT_GROUPON_HPP_
 #include <com/sun/star/report/GroupOn.hpp>
-#endif
-#ifndef _COM_SUN_STAR_REPORT_KEEPTOGETHER_HPP_
 #include <com/sun/star/report/KeepTogether.hpp>
-#endif
-#ifndef _XMLOFF_XMLEMENT_HXX
 #include <xmloff/xmlement.hxx>
-#endif
-#ifndef _COM_SUN_STAR_REPORT_XREPORTCONTROLFORMAT_HPP_
 #include <com/sun/star/report/XReportControlFormat.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FORM_LISTSOURCETYPE_HPP_
 #include <com/sun/star/form/ListSourceType.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDB_COMMANDTYPE_HPP_
 #include <com/sun/star/sdb/CommandType.hpp>
-#endif
-#ifndef _COM_SUN_STAR_DRAWING_TEXTVERTICALADJUST_HPP_
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
-#endif
-#ifndef _XMLOFF_ENUMPROPERTYHANDLER_HXX
 #include <xmloff/EnumPropertyHdl.hxx>
-#endif
 
 #define XML_RPT_ALGINMENT   (XML_DB_TYPES_START+1)
 namespace rptxml




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to