diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 21:19:55 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 21:19:55 +0000 |
commit | 4a835e03dffe008826aef74013c40c0f19c3e105 (patch) | |
tree | 3dd5f5b714d722f0c3dcf5c7aa86bc992c02f5a4 | |
parent | 8897f8292f1e40ca7442e5e66db5ebbe7accdcca (diff) |
INTEGRATION: CWS changefileheader (1.17.18); FILE MERGED
2008/04/01 16:09:51 thb 1.17.18.3: #i85898# Stripping all external header guards
2008/04/01 13:04:56 thb 1.17.18.2: #i85898# Stripping all external header guards
2008/03/31 16:28:18 rt 1.17.18.1: #i87441# Change license header to LPGL v3.
-rw-r--r-- | xmloff/source/style/GradientStyle.cxx | 82 | ||||
-rw-r--r-- | xmloff/source/style/HatchStyle.cxx | 79 |
2 files changed, 38 insertions, 123 deletions
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx index bbd9cca624..96f46a766c 100644 --- a/xmloff/source/style/GradientStyle.cxx +++ b/xmloff/source/style/GradientStyle.cxx @@ -1,92 +1,48 @@ /************************************************************************* * - * 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: GradientStyle.cxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.17 $ + * $RCSfile: GradientStyle.cxx,v $ + * $Revision: 1.18 $ * - * last change: $Author: rt $ $Date: 2008-03-12 10:42:21 $ + * 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. * ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" - -#ifndef _XMLOFF_GRADIENTSTYLE_HXX #include "GradientStyle.hxx" -#endif - -#ifndef _COM_SUN_STAR_AWT_GRADIENT_HPP_ #include <com/sun/star/awt/Gradient.hpp> -#endif - -#ifndef _XMLOFF_ATTRLIST_HXX #include <xmloff/attrlist.hxx> -#endif - -#ifndef _XMLOFF_NMSPMAP_HXX #include <xmloff/nmspmap.hxx> -#endif - -#ifndef _XMLOFF_XMLUCONV_HXX #include <xmloff/xmluconv.hxx> -#endif - -#ifndef _XMLOFF_XMLNMSPE_HXX #include "xmlnmspe.hxx" -#endif - -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.hxx> -#endif - -#ifndef _RTL_USTRBUF_HXX_ #include <rtl/ustrbuf.hxx> -#endif - -#ifndef _RTL_USTRING_ #include <rtl/ustring.hxx> -#endif - -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif - -#ifndef _XMLOFF_XMLTKMAP_HXX #include <xmloff/xmltkmap.hxx> -#endif - -#ifndef _XMLOFF_XMLEXP_HXX #include <xmloff/xmlexp.hxx> -#endif - -#ifndef _XMLOFF_XMLIMP_HXX #include <xmloff/xmlimp.hxx> -#endif diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx index ee6ffc5d32..bc6b4847b2 100644 --- a/xmloff/source/style/HatchStyle.cxx +++ b/xmloff/source/style/HatchStyle.cxx @@ -1,88 +1,47 @@ /************************************************************************* * - * 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: HatchStyle.cxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.17 $ + * $RCSfile: HatchStyle.cxx,v $ + * $Revision: 1.18 $ * - * last change: $Author: rt $ $Date: 2008-03-12 10:42:38 $ + * 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. * ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" - -#ifndef _XMLOFF_HATCHSTYLE_HXX #include "HatchStyle.hxx" -#endif - -#ifndef _COM_SUN_STAR_DRAWING_HATCH_HPP_ #include <com/sun/star/drawing/Hatch.hpp> -#endif - -#ifndef _XMLOFF_NMSPMAP_HXX #include <xmloff/nmspmap.hxx> -#endif - -#ifndef _XMLOFF_XMLUCONV_HXX #include <xmloff/xmluconv.hxx> -#endif - -#ifndef _XMLOFF_XMLNMSPE_HXX #include "xmlnmspe.hxx" -#endif - -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.hxx> -#endif - -#ifndef _XMLOFF_XMLEXP_HXX #include <xmloff/xmlexp.hxx> -#endif - -#ifndef _XMLOFF_XMLIMP_HXX #include <xmloff/xmlimp.hxx> -#endif - -#ifndef _RTL_USTRBUF_HXX_ #include <rtl/ustrbuf.hxx> -#endif - -#ifndef _RTL_USTRING_ #include <rtl/ustring.hxx> -#endif - -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif - -#ifndef _XMLOFF_XMLTKMAP_HXX #include <xmloff/xmltkmap.hxx> -#endif using namespace ::com::sun::star; using ::rtl::OUString; |