INTEGRATION: CWS changefileheader (1.8.48); FILE MERGED

2008/04/01 12:26:07 thb 1.8.48.2: #i85898# Stripping all external header guards
2008/03/31 07:22:51 rt 1.8.48.1: #i87441# Change license header to LPGL v3.
This commit is contained in:
Rüdiger Timm
2008-04-11 11:00:04 +00:00
parent e126e0dad8
commit 3d2362ec83

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: options.hxx,v $ * Copyright 2008 by Sun Microsystems, Inc.
* *
* $Revision: 1.8 $ * OpenOffice.org - a multi-platform office productivity suite
* *
* last change: $Author: hr $ $Date: 2006-06-20 02:22:39 $ * $RCSfile: options.hxx,v $
* $Revision: 1.9 $
* *
* The Contents of this file are made available subject to * This file is part of OpenOffice.org.
* the terms of GNU Lesser General Public License Version 2.1.
* *
* 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 * OpenOffice.org is distributed in the hope that it will be useful,
* ============================================= * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Copyright 2005 by Sun Microsystems, Inc. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* 901 San Antonio Road, Palo Alto, CA 94303, USA * 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 * You should have received a copy of the GNU Lesser General Public License
* modify it under the terms of the GNU Lesser General Public * version 3 along with OpenOffice.org. If not, see
* License version 2.1, as published by the Free Software Foundation. * <http://www.openoffice.org/license.html>
* * for a copy of the LGPLv3 License.
* 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
* *
************************************************************************/ ************************************************************************/
@@ -37,10 +32,7 @@
#define INCLUDED_CODEMAKER_OPTIONS_HXX #define INCLUDED_CODEMAKER_OPTIONS_HXX
#include <hash_map> #include <hash_map>
#ifndef INCLUDED_CODEMAKER_GLOBAL_HXX
#include <codemaker/global.hxx> #include <codemaker/global.hxx>
#endif
#if defined( _MSC_VER ) && ( _MSC_VER < 1200 ) #if defined( _MSC_VER ) && ( _MSC_VER < 1200 )
typedef ::std::__hash_map__ typedef ::std::__hash_map__