INTEGRATION: CWS changefileheader (1.6.12); FILE MERGED

2008/04/01 15:17:03 thb 1.6.12.3: #i85898# Stripping all external header guards
2008/04/01 12:30:50 thb 1.6.12.2: #i85898# Stripping all external header guards
2008/03/31 13:13:16 rt 1.6.12.1: #i87441# Change license header to LPGL v3.
This commit is contained in:
Rüdiger Timm 2008-04-11 08:32:35 +00:00
parent a76b449d04
commit 089cbad103
2 changed files with 36 additions and 67 deletions

View file

@ -1,35 +1,30 @@
/*************************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* $RCSfile: FPentry.cxx,v $
* Copyright 2008 by Sun Microsystems, Inc.
*
* $Revision: 1.6 $
* OpenOffice.org - a multi-platform office productivity suite
*
* last change: $Author: rt $ $Date: 2008-03-12 07:31:09 $
* $RCSfile: FPentry.cxx,v $
* $Revision: 1.7 $
*
* 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
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
@ -39,26 +34,11 @@
//----------------------------------------------
// includes of other projects
//----------------------------------------------
#ifndef _CPPUHELPER_FACTORY_HXX_
#include <cppuhelper/factory.hxx>
#endif
#ifndef _COM_SUN_STAR_CONTAINER_XSET_HPP_
#include <com/sun/star/container/XSet.hpp>
#endif
#ifndef _OSL_DIAGNOSE_H_
#include <osl/diagnose.h>
#endif
#ifndef _FILEPICKER_HXX_
#include "FilePicker.hxx"
#endif
#ifndef _FPSERVICEINFO_HXX_
#include "FPServiceInfo.hxx"
#endif
#pragma warning (disable:4917)
#include "VistaFilePicker.hxx"

View file

@ -1,35 +1,30 @@
/*************************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* $RCSfile: FilterContainer.cxx,v $
* Copyright 2008 by Sun Microsystems, Inc.
*
* $Revision: 1.6 $
* OpenOffice.org - a multi-platform office productivity suite
*
* last change: $Author: rt $ $Date: 2008-03-12 07:31:41 $
* $RCSfile: FilterContainer.cxx,v $
* $Revision: 1.7 $
*
* 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
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
@ -38,14 +33,8 @@
#include <stdexcept>
#ifndef _OSL_DIAGNOSE_H_
#include <osl/diagnose.h>
#endif
#ifndef _FILTER_CONTAINER_HXX_
#include "FilterContainer.hxx"
#endif
#include <utility>