diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 09:32:47 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 09:32:47 +0000 |
commit | 8655e027cc7816ce6fbb91cff9ff095d5454bb94 (patch) | |
tree | 3a5e5ffd8b1d4f64af6b479f610c752441365370 | |
parent | 194b22d3bae32de773a96d7a13469cdd65a4dfe7 (diff) |
INTEGRATION: CWS changefileheader (1.2.378); FILE MERGED
2008/04/01 15:25:01 thb 1.2.378.3: #i85898# Stripping all external header guards
2008/04/01 12:34:02 thb 1.2.378.2: #i85898# Stripping all external header guards
2008/03/31 13:23:36 rt 1.2.378.1: #i87441# Change license header to LPGL v3.
-rw-r--r-- | sal/inc/osl/security_decl.hxx | 48 |
1 files changed, 19 insertions, 29 deletions
diff --git a/sal/inc/osl/security_decl.hxx b/sal/inc/osl/security_decl.hxx index b693aea73..c81abd928 100644 --- a/sal/inc/osl/security_decl.hxx +++ b/sal/inc/osl/security_decl.hxx @@ -1,48 +1,38 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. * - * $RCSfile: security_decl.hxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.2 $ + * $RCSfile: security_decl.hxx,v $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-08 14:32:01 $ + * This file is part of OpenOffice.org. * - * The Contents of this file are made available subject to - * 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. * + * 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). * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * 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 _OSL_SECURITY_DECL_HXX_ #define _OSL_SECURITY_DECL_HXX_ -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif - -#ifndef _OSL_SECURITY_H_ # include <osl/security.h> -#endif namespace osl { |