diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-04-10 15:38:06 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-10 15:38:06 +0000 |
commit | f161a7af18866d13b31c8c101bbeb64e1cb66699 (patch) | |
tree | 4009b3a7b71bdadaeec267e3ec3b84ac44c02361 | |
parent | 171f7a6a4cf027379d6e169989a26353aa672ec6 (diff) |
INTEGRATION: CWS changefileheader (1.3.58); FILE MERGED
2008/04/01 15:57:43 thb 1.3.58.2: #i85898# Stripping all external header guards
2008/03/31 16:55:31 rt 1.3.58.1: #i87441# Change license header to LPGL v3.
-rw-r--r-- | sw/source/filter/html/htmlfld.hxx | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/sw/source/filter/html/htmlfld.hxx b/sw/source/filter/html/htmlfld.hxx index 7ada8e02d6bd..f9127f5cde80 100644 --- a/sw/source/filter/html/htmlfld.hxx +++ b/sw/source/filter/html/htmlfld.hxx @@ -1,44 +1,37 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: htmlfld.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.3 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: obo $ $Date: 2008-02-26 14:17:17 $ + * $RCSfile: htmlfld.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 + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. * ************************************************************************/ #ifndef _HTMLFLD_HXX #define _HTMLFLD_HXX -#ifndef _HTMLKYWD_HXX #include <svtools/htmlkywd.hxx> -#endif extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FT_author, "AUTHOR" ); extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FT_sender, "SENDER" ); |