diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 09:37:54 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-11 09:37:54 +0000 |
commit | c47e7d86dffdf6ae9333c8995e1e3198441051ac (patch) | |
tree | bb9b29d03d1c7bafb51b544b78a8e6fdaaea8c1d | |
parent | d39cb10f80bdc71c1a19c85c4787c5ee8c0a3a81 (diff) |
INTEGRATION: CWS changefileheader (1.5.32); FILE MERGED
2008/04/01 12:32:32 thb 1.5.32.2: #i85898# Stripping all external header guards
2008/03/31 07:25:06 rt 1.5.32.1: #i87441# Change license header to LPGL v3.
-rw-r--r-- | rdbmaker/inc/codemaker/options.hxx | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/rdbmaker/inc/codemaker/options.hxx b/rdbmaker/inc/codemaker/options.hxx index 70df07878718..12d3ec50c4ad 100644 --- a/rdbmaker/inc/codemaker/options.hxx +++ b/rdbmaker/inc/codemaker/options.hxx @@ -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.5 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2006-06-20 04:09:11 $ + * $RCSfile: options.hxx,v $ + * $Revision: 1.6 $ * - * 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 _CODEMAKER_OPTIONS_HXX_ #include <hash_map> - -#ifndef _CODEMAKER_GLOBAL_HXX_ #include <codemaker/global.hxx> -#endif #if defined( _MSC_VER ) && ( _MSC_VER < 1200 ) typedef ::std::__hash_map__ |