From 1a1a2deb180f8f84d9c87beac91751598a5ea0b9 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Thu, 10 Apr 2008 11:49:06 +0000 Subject: INTEGRATION: CWS changefileheader (1.3.268); FILE MERGED 2008/04/01 12:34:23 thb 1.3.268.2: #i85898# Stripping all external header guards 2008/03/31 13:24:15 rt 1.3.268.1: #i87441# Change license header to LPGL v3. --- sal/textenc/unichars.c | 48 ++++++++++++++++++------------------------------ sal/textenc/unichars.h | 43 ++++++++++++++++++------------------------- 2 files changed, 36 insertions(+), 55 deletions(-) (limited to 'sal/textenc') diff --git a/sal/textenc/unichars.c b/sal/textenc/unichars.c index 0b94dbb00ad4..a812475d1bc1 100644 --- a/sal/textenc/unichars.c +++ b/sal/textenc/unichars.c @@ -1,48 +1,36 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: unichars.c,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.3 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2006-06-20 04:39:23 $ + * $RCSfile: unichars.c,v $ + * $Revision: 1.4 $ * - * 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 INCLUDED_RTL_TEXTENC_UNICHARS_H #include "unichars.h" -#endif - -#ifndef _OSL_DIAGNOSE_H_ #include "osl/diagnose.h" -#endif -#ifndef _SAL_TYPES_H_ #include "sal/types.h" -#endif int ImplIsNoncharacter(sal_uInt32 nUtf32) { diff --git a/sal/textenc/unichars.h b/sal/textenc/unichars.h index 1f947881d8eb..eac62dcf1d2d 100644 --- a/sal/textenc/unichars.h +++ b/sal/textenc/unichars.h @@ -1,44 +1,37 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: unichars.h,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.3 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2006-06-20 04:39:38 $ + * $RCSfile: unichars.h,v $ + * $Revision: 1.4 $ * - * 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 INCLUDED_RTL_TEXTENC_UNICHARS_H #define INCLUDED_RTL_TEXTENC_UNICHARS_H -#ifndef _SAL_TYPES_H_ #include "sal/types.h" -#endif #if defined __cplusplus extern "C" { -- cgit