From 83cfc3b5e91884bfe42cfc806fdcb41aa0a3f7df Mon Sep 17 00:00:00 2001 From: RĂ¼diger Timm Date: Thu, 10 Apr 2008 13:17:21 +0000 Subject: INTEGRATION: CWS changefileheader (1.7.52); FILE MERGED 2008/04/01 15:42:41 thb 1.7.52.2: #i85898# Stripping all external header guards 2008/03/31 15:27:46 rt 1.7.52.1: #i87441# Change license header to LPGL v3. --- store/inc/store/types.h | 48 +++++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) (limited to 'store/inc') diff --git a/store/inc/store/types.h b/store/inc/store/types.h index d5098be12019..17551381aca5 100644 --- a/store/inc/store/types.h +++ b/store/inc/store/types.h @@ -1,48 +1,38 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: types.h,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.7 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: kz $ $Date: 2006-02-28 10:31:30 $ + * $RCSfile: types.h,v $ + * $Revision: 1.8 $ * - * 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 + * + * for a copy of the LGPLv3 License. * ************************************************************************/ #ifndef _STORE_TYPES_H_ -#define _STORE_TYPES_H_ "$Revision: 1.7 $" +#define _STORE_TYPES_H_ "$Revision: 1.8 $" -#ifndef _SAL_TYPES_H_ #include -#endif - -#ifndef _RTL_USTRING_H_ #include -#endif #ifdef __cplusplus extern "C" { -- cgit