diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 13:42:29 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 13:42:29 +0000 |
commit | 5e3f8c57ff953178cd8e8320f0bb30e0436d1a1b (patch) | |
tree | d8fca48d4667f2d004f988c8a4639063c9cc0004 /sw/source/core/layout/colfrm.cxx | |
parent | 3d3afeb6d5cd2026b2b7ade3f24e6d9f4f881e49 (diff) |
INTEGRATION: CWS changefileheader (1.18.240); FILE MERGED
2008/04/01 15:57:14 thb 1.18.240.3: #i85898# Stripping all external header guards
2008/04/01 12:54:12 thb 1.18.240.2: #i85898# Stripping all external header guards
2008/03/31 16:54:20 rt 1.18.240.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'sw/source/core/layout/colfrm.cxx')
-rw-r--r-- | sw/source/core/layout/colfrm.cxx | 55 |
1 files changed, 18 insertions, 37 deletions
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx index 6912966a5a96..537cd1439e4c 100644 --- a/sw/source/core/layout/colfrm.cxx +++ b/sw/source/core/layout/colfrm.cxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: colfrm.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.18 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2007-09-27 09:01:23 $ + * $RCSfile: colfrm.cxx,v $ + * $Revision: 1.19 $ * - * 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. * ************************************************************************/ @@ -41,26 +36,12 @@ #include "doc.hxx" #include "hintids.hxx" - -#ifndef _SVX_ULSPITEM_HXX //autogen #include <svx/ulspitem.hxx> -#endif -#ifndef _SVX_LRSPITEM_HXX //autogen #include <svx/lrspitem.hxx> -#endif - -#ifndef _FMTCLDS_HXX //autogen #include <fmtclds.hxx> -#endif -#ifndef _FMTFORDR_HXX //autogen #include <fmtfordr.hxx> -#endif -#ifndef _FRMFMT_HXX //autogen #include <frmfmt.hxx> -#endif -#ifndef _NODE_HXX //autogen #include <node.hxx> -#endif #include "frmtool.hxx" #include "colfrm.hxx" #include "pagefrm.hxx" |