diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 13:45:44 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 13:45:44 +0000 |
commit | d7bbf646fd6ad5037c9d2705cd617acfcf7859a6 (patch) | |
tree | 5c84c5996976f1fa73944979e5385b127a6826f7 /sw/source/core/layout/hffrm.cxx | |
parent | c5790d09baa963f0fd5e5d39aeecf2ea36f39d4c (diff) |
INTEGRATION: CWS changefileheader (1.26.242); FILE MERGED
2008/04/01 12:54:14 thb 1.26.242.2: #i85898# Stripping all external header guards
2008/03/31 16:54:22 rt 1.26.242.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'sw/source/core/layout/hffrm.cxx')
-rw-r--r-- | sw/source/core/layout/hffrm.cxx | 52 |
1 files changed, 18 insertions, 34 deletions
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx index 966c73fd970b..91be55ba1baa 100644 --- a/sw/source/core/layout/hffrm.cxx +++ b/sw/source/core/layout/hffrm.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: hffrm.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.26 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2007-09-27 09:03:30 $ + * $RCSfile: hffrm.cxx,v $ + * $Revision: 1.27 $ * - * 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. * ************************************************************************/ @@ -40,16 +35,9 @@ #include "viewsh.hxx" #include "doc.hxx" #include "errhdl.hxx" - -#ifndef _FMTCNTNT_HXX //autogen #include <fmtcntnt.hxx> -#endif -#ifndef _FMTHDFT_HXX //autogen #include <fmthdft.hxx> -#endif -#ifndef _FMTFSIZE_HXX //autogen #include <fmtfsize.hxx> -#endif #include "hffrm.hxx" #include "txtfrm.hxx" #include "sectfrm.hxx" @@ -60,13 +48,9 @@ #include "ndindex.hxx" #include "hfspacingitem.hxx" // OD 2004-05-24 #i28701# -#ifndef _SORTEDOBJS_HXX #include <sortedobjs.hxx> -#endif // --> OD 2005-03-03 #i43771# -#ifndef _OBJECTFORMATTER_HXX #include <objectformatter.hxx> -#endif // <-- extern BOOL bObjsDirect; //frmtool.cxx |