diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 02:56:55 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 02:56:55 +0000 |
commit | 17aa64083a43b54d6d94c6fc0ff09cf0a45d61da (patch) | |
tree | f0977668442317293be4bef8a20522b7925188e9 /svx/source/unodraw | |
parent | 0a343ff754d864b5787b93e97c1e06c68d96972e (diff) |
INTEGRATION: CWS changefileheader (1.10.368); FILE MERGED
2008/04/01 15:51:53 thb 1.10.368.3: #i85898# Stripping all external header guards
2008/04/01 12:50:15 thb 1.10.368.2: #i85898# Stripping all external header guards
2008/03/31 14:24:14 rt 1.10.368.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'svx/source/unodraw')
-rw-r--r-- | svx/source/unodraw/unogtabl.cxx | 55 | ||||
-rw-r--r-- | svx/source/unodraw/unohtabl.cxx | 55 |
2 files changed, 38 insertions, 72 deletions
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index 66c83257ff..9e17cc99e3 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -1,56 +1,39 @@ /************************************************************************* * - * 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: unogtabl.cxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.10 $ + * $RCSfile: unogtabl.cxx,v $ + * $Revision: 1.11 $ * - * last change: $Author: hr $ $Date: 2007-06-27 19:24:01 $ + * 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_svx.hxx" - -#ifndef _COM_SUN_STAR_AWT_GRADIENT_HPP_ #include <com/sun/star/awt/Gradient.hpp> -#endif - -#ifndef _SFXITEMPOOL_HXX #include <svtools/itempool.hxx> -#endif - -#ifndef _SFXITEMSET_HXX //autogen #include <svtools/itemset.hxx> -#endif - -#ifndef _SVX_UNONAMEITEMTABLE_HXX_ #include "UnoNameItemTable.hxx" -#endif #include <svx/xgrad.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index 605a2c35d9..329905c31d 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -1,56 +1,39 @@ /************************************************************************* * - * 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: unohtabl.cxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.10 $ + * $RCSfile: unohtabl.cxx,v $ + * $Revision: 1.11 $ * - * last change: $Author: hr $ $Date: 2007-06-27 19:24:16 $ + * 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_svx.hxx" - -#ifndef _COM_SUN_STAR_DRAWING_HATCH_HPP_ #include <com/sun/star/drawing/Hatch.hpp> -#endif - -#ifndef _SFXITEMPOOL_HXX #include <svtools/itempool.hxx> -#endif - -#ifndef _SFXITEMSET_HXX //autogen #include <svtools/itemset.hxx> -#endif - -#ifndef _SVX_UNONAMEITEMTABLE_HXX_ #include "UnoNameItemTable.hxx" -#endif #include <svx/xhatch.hxx> #include <svx/svdmodel.hxx> |