diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 19:47:24 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 19:47:24 +0000 |
commit | a1014073871a6402bb5b77596ee4101f2ac2c2fe (patch) | |
tree | da4b34539f965ae60e36898a7e7c4b6436b9a9b1 | |
parent | 1cc6a660172e32d6b3129264a558360392bc9f28 (diff) |
INTEGRATION: CWS changefileheader (1.4.162); FILE MERGED
2008/04/01 13:04:21 thb 1.4.162.2: #i85898# Stripping all external header guards
2008/03/31 16:27:54 rt 1.4.162.1: #i87441# Change license header to LPGL v3.
-rw-r--r-- | xmloff/inc/XMLTextColumnsPropertyHandler.hxx | 45 | ||||
-rw-r--r-- | xmloff/inc/animations.hxx | 45 |
2 files changed, 38 insertions, 52 deletions
diff --git a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx index 05fa074ea1..fddaac6b67 100644 --- a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx +++ b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx @@ -1,44 +1,37 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. * - * $RCSfile: XMLTextColumnsPropertyHandler.hxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.4 $ + * $RCSfile: XMLTextColumnsPropertyHandler.hxx,v $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2007-06-27 14:43:55 $ + * This file is part of OpenOffice.org. * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * 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. * + * 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). * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * 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 _XMLOFF_XMLTEXTCOLUMNSPROPERTYHANDLER_HXX #define _XMLOFF_XMLTEXTCOLUMNSPROPERTYHANDLER_HXX -#ifndef _XMLOFF_PROPERTYHANDLERBASE_HXX #include <xmloff/xmlprhdl.hxx> -#endif /** PropertyHandler for the XML-data-type: diff --git a/xmloff/inc/animations.hxx b/xmloff/inc/animations.hxx index 1e86fe5c70..120ce1235d 100644 --- a/xmloff/inc/animations.hxx +++ b/xmloff/inc/animations.hxx @@ -1,44 +1,37 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. * - * $RCSfile: animations.hxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.4 $ + * $RCSfile: animations.hxx,v $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2007-06-27 14:45:08 $ + * This file is part of OpenOffice.org. * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * 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. * + * 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). * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * 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 _XMLOFF_ANIMATIONS_HXX #define _XMLOFF_ANIMATIONS_HXX -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.hxx> -#endif struct SvXMLEnumMapEntry; |