INTEGRATION: CWS changefileheader (1.2.260); FILE MERGED

2008/04/01 12:39:58 thb 1.2.260.2: #i85898# Stripping all external header guards
2008/03/31 16:08:00 rt 1.2.260.1: #i87441# Change license header to LPGL v3.
This commit is contained in:
Rüdiger Timm 2008-04-10 09:15:41 +00:00
parent 4b511ea4e9
commit 7ec36c3d92
2 changed files with 36 additions and 51 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: registryw9x.hxx,v $
* Copyright 2008 by Sun Microsystems, Inc.
*
* $Revision: 1.2 $
* OpenOffice.org - a multi-platform office productivity suite
*
* last change: $Author: rt $ $Date: 2005-09-07 16:37:21 $
* $RCSfile: registryw9x.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
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
@ -37,10 +32,7 @@
#define _REGISTRYW9X_HXX_
#include "registry.hxx"
#ifndef _REGISTRY_HXX_
#include "registry.hxx"
#endif
//---------------------------------------
// constants

View file

@ -1,44 +1,37 @@
/*************************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* $RCSfile: registrywnt.hxx,v $
* Copyright 2008 by Sun Microsystems, Inc.
*
* $Revision: 1.2 $
* OpenOffice.org - a multi-platform office productivity suite
*
* last change: $Author: rt $ $Date: 2005-09-07 16:37:56 $
* $RCSfile: registrywnt.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
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef _REGISTRYWNT_HXX_
#define _REGISTRYWNT_HXX_
#ifndef _REGISTRY_HXX_
#include "registry.hxx"
#endif
//---------------------------------------
// constants