diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 11:32:53 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 11:32:53 +0000 |
commit | cf477f2c469f279b9b170f09389a031a5ab461fa (patch) | |
tree | e6387c2c80cb5712c88b3a545f7e794766832c42 /sal/textenc | |
parent | INTEGRATION: CWS changefileheader (1.4.378); FILE MERGED (diff) | |
download | core-cf477f2c469f279b9b170f09389a031a5ab461fa.tar.gz core-cf477f2c469f279b9b170f09389a031a5ab461fa.zip |
INTEGRATION: CWS changefileheader (1.8.268); FILE MERGED
2008/04/01 12:34:21 thb 1.8.268.2: #i85898# Stripping all external header guards
2008/03/31 13:24:10 rt 1.8.268.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'sal/textenc')
-rw-r--r-- | sal/textenc/converteuctw.c | 59 | ||||
-rw-r--r-- | sal/textenc/convertgb18030.c | 59 |
2 files changed, 36 insertions, 82 deletions
diff --git a/sal/textenc/converteuctw.c b/sal/textenc/converteuctw.c index bc88d43512b7..0a60a9d24654 100644 --- a/sal/textenc/converteuctw.c +++ b/sal/textenc/converteuctw.c @@ -1,64 +1,41 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: converteuctw.c,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 04:36:41 $ + * $RCSfile: converteuctw.c,v $ + * $Revision: 1.9 $ * - * 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. * ************************************************************************/ -#ifndef INCLUDED_RTL_TEXTENC_CONVERTEUCTW_H #include "converteuctw.h" -#endif - -#ifndef INCLUDED_RTL_TEXTENC_CONTEXT_H #include "context.h" -#endif -#ifndef INCLUDED_RTL_TEXTENC_CONVERTER_H #include "converter.h" -#endif -#ifndef INCLUDED_RTL_TEXTENC_TENCHELP_H #include "tenchelp.h" -#endif -#ifndef INCLUDED_RTL_TEXTENC_UNICHARS_H #include "unichars.h" -#endif - -#ifndef _RTL_ALLOC_H_ #include "rtl/alloc.h" -#endif -#ifndef _RTL_TEXTCVT_H #include "rtl/textcvt.h" -#endif -#ifndef _SAL_TYPES_H_ #include "sal/types.h" -#endif typedef enum { diff --git a/sal/textenc/convertgb18030.c b/sal/textenc/convertgb18030.c index 0422534d5168..b43204d251d7 100644 --- a/sal/textenc/convertgb18030.c +++ b/sal/textenc/convertgb18030.c @@ -1,64 +1,41 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: convertgb18030.c,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 04:36:52 $ + * $RCSfile: convertgb18030.c,v $ + * $Revision: 1.9 $ * - * 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. * ************************************************************************/ -#ifndef INCLUDED_RTL_TEXTENC_CONVERTGB18030_H #include "convertgb18030.h" -#endif - -#ifndef INCLUDED_RTL_TEXTENC_CONTEXT_H #include "context.h" -#endif -#ifndef INCLUDED_RTL_TEXTENC_CONVERTER_H #include "converter.h" -#endif -#ifndef INCLUDED_RTL_TEXTENC_TENCHELP_H #include "tenchelp.h" -#endif -#ifndef INCLUDED_RTL_TEXTENC_UNICHARS_H #include "unichars.h" -#endif - -#ifndef _RTL_ALLOC_H_ #include "rtl/alloc.h" -#endif -#ifndef _RTL_TEXTCVT_H #include "rtl/textcvt.h" -#endif -#ifndef _SAL_TYPES_H_ #include "sal/types.h" -#endif typedef enum { |