From 3e2d3ce458d45b92e9d0186c07934fcd8c82256c Mon Sep 17 00:00:00 2001 From: RĂ¼diger Timm Date: Thu, 10 Apr 2008 17:29:40 +0000 Subject: INTEGRATION: CWS changefileheader (1.2.104); FILE MERGED 2008/04/01 15:23:36 thb 1.2.104.3: #i85898# Stripping all external header guards 2008/04/01 12:33:08 thb 1.2.104.2: #i85898# Stripping all external header guards 2008/03/31 13:32:06 rt 1.2.104.1: #i87441# Change license header to LPGL v3. --- reportdesign/source/filter/xml/dbloader2.cxx | 46 ++++----- reportdesign/source/filter/xml/dbloader2.hxx | 128 ++++-------------------- reportdesign/source/filter/xml/xmlAutoStyle.cxx | 52 ++++------ 3 files changed, 54 insertions(+), 172 deletions(-) (limited to 'reportdesign/source/filter') diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index afe665418c01..0d99964946ca 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -1,45 +1,35 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: dbloader2.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2007-07-09 11:56:16 $ + * $RCSfile: dbloader2.cxx,v $ + * $Revision: 1.3 $ * - * 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. * ************************************************************************/ #include "precompiled_reportdesign.hxx" - -#ifndef RPTXML_DBLOADER2_HXX #include "dbloader2.hxx" -#endif -#ifndef _COMPHELPER_SEQUENCE_HXX_ #include -#endif // ------------------------------------------------------------------------- namespace rptxml { diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx index ec9289f60c21..4af8752d896e 100644 --- a/reportdesign/source/filter/xml/dbloader2.hxx +++ b/reportdesign/source/filter/xml/dbloader2.hxx @@ -1,171 +1,79 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: dbloader2.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2007-07-09 11:56:17 $ + * $RCSfile: dbloader2.hxx,v $ + * $Revision: 1.3 $ * - * 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. * ************************************************************************/ #ifndef RPTXML_DBLOADER2_HXX #define RPTXML_DBLOADER2_HXX -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif -#ifndef _URLOBJ_HXX //autogen #include -#endif -#ifndef _TOOLKIT_AWT_VCLXWINDOW_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_TASK_XSTATUSINDICATORFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_TASK_XSTATUSINDICATOR_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XFRAMELOADER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XDOCUMENTDATASOURCE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XLOADEVENTLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_EMBED_XSTORAGE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_NAMEDVALUE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UI_DIALOGS_XEXECUTABLEDIALOG_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XURLTRANSFORMER_HPP_ #include -#endif - -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XEXTENDEDFILTERDETECTION_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE2_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include -#endif -#ifndef _SV_SVAPP_HXX #include -#endif -#ifndef _UCBHELPER_CONTENT_HXX #include -#endif -#ifndef _UCBHELPER_COMMANDENVIRONMENT_HXX #include -#endif -#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include -#endif -#ifndef _COMPHELPER_DOCUMENTCONSTANTS_HXX #include -#endif -#ifndef _COMPHELPER_TYPES_HXX_ #include -#endif -#ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX_ #include -#endif -#ifndef _OSL_FILE_HXX_ #include -#endif -#ifndef _UCBHELPER_CONTENTBROKER_HXX #include -#endif -#ifndef _SFXDOCFILE_HXX //autogen wg. SfxMedium #include -#endif -#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _COMPHELPER_STORAGEHELPER_HXX #include -#endif -#ifndef _COM_SUN_STAR_TASK_XJOBEXECUTOR_HPP_ #include -#endif -#ifndef _SV_MSGBOX_HXX #include -#endif // ------------------------------------------------------------------------- namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx index 984c79280af1..157ca2afb1f0 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx @@ -1,54 +1,38 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: xmlAutoStyle.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2007-07-09 11:56:17 $ + * $RCSfile: xmlAutoStyle.cxx,v $ + * $Revision: 1.3 $ * - * 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. * ************************************************************************/ #include "precompiled_reportdesign.hxx" - -#ifndef RPT_XMLAUTOSTYLE_HXX #include "xmlAutoStyle.hxx" -#endif -#ifndef RPT_XMLHELPER_HXX #include "xmlHelper.hxx" -#endif -#ifndef RPT_XMLEXPORT_HXX #include "xmlExport.hxx" -#endif -#ifndef _XMLOFF_FAMILIES_HXX_ #include -#endif -#ifndef _TOOLS_DEBUG_HXX #include -#endif namespace rptxml { -- cgit