From a5f2ff0289cbe971f1ee712dfc9a1dc44cac18f4 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Thu, 10 Apr 2008 11:16:29 +0000 Subject: INTEGRATION: CWS changefileheader (1.3.114); FILE MERGED 2008/04/01 12:31:45 thb 1.3.114.2: #i85898# Stripping all external header guards 2008/03/31 16:25:36 rt 1.3.114.1: #i87441# Change license header to LPGL v3. --- linguistic/inc/hyphdta.hxx | 45 ++++++++++++++++++--------------------------- linguistic/inc/thesdta.hxx | 43 ++++++++++++++++++------------------------- 2 files changed, 36 insertions(+), 52 deletions(-) (limited to 'linguistic/inc') diff --git a/linguistic/inc/hyphdta.hxx b/linguistic/inc/hyphdta.hxx index 0f6392442043..0c7decde270c 100644 --- a/linguistic/inc/hyphdta.hxx +++ b/linguistic/inc/hyphdta.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: hyphdta.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.3 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2005-09-07 19:46:07 $ + * $RCSfile: hyphdta.hxx,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. * ************************************************************************/ @@ -37,12 +32,8 @@ #define _LINGUISTIC_HYPHDTA_HXX_ -#ifndef _COM_SUN_STAR_LINGUISTIC2_XHYPHENATEDWORD_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LINGUISTIC2_XPOSSIBLEHYPHENS_HPP_ #include -#endif #include diff --git a/linguistic/inc/thesdta.hxx b/linguistic/inc/thesdta.hxx index 51041436dd7a..1e38605d9eb4 100644 --- a/linguistic/inc/thesdta.hxx +++ b/linguistic/inc/thesdta.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: thesdta.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.3 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2005-09-07 19:47:19 $ + * $RCSfile: thesdta.hxx,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. * ************************************************************************/ @@ -37,9 +32,7 @@ #define _LINGUISTIC_THESDTA_HXX_ -#ifndef _COM_SUN_STAR_LINGUISTIC2_XMEANING_HPP_ #include -#endif #include // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type #include // helper for implementations -- cgit