diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 13:50:23 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 13:50:23 +0000 |
commit | 089d41faf3bca1ef0e1036dd421fe735c64f7c71 (patch) | |
tree | 9071618b58b5a68b5542a2a4cc196b611f1b013d /sw/source/core/layout/objectformattertxtfrm.cxx | |
parent | 9f9c11cc6118fdc26209290ed04f9d62a9859867 (diff) |
INTEGRATION: CWS changefileheader (1.23.34); FILE MERGED
2008/04/01 12:54:15 thb 1.23.34.2: #i85898# Stripping all external header guards
2008/03/31 16:54:23 rt 1.23.34.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'sw/source/core/layout/objectformattertxtfrm.cxx')
-rw-r--r-- | sw/source/core/layout/objectformattertxtfrm.cxx | 71 |
1 files changed, 18 insertions, 53 deletions
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx index 4ae806f063f5..697bea11dabf 100644 --- a/sw/source/core/layout/objectformattertxtfrm.cxx +++ b/sw/source/core/layout/objectformattertxtfrm.cxx @@ -1,85 +1,50 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: objectformattertxtfrm.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.23 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2008-03-12 12:22:05 $ + * $RCSfile: objectformattertxtfrm.cxx,v $ + * $Revision: 1.24 $ * - * 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. * ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#ifndef _OBJECTFORMATTERTXTFRM_HXX #include <objectformattertxtfrm.hxx> -#endif -#ifndef _ANCHOREDOBJECT_HXX #include <anchoredobject.hxx> -#endif -#ifndef _SORTEDOBJS_HXX #include <sortedobjs.hxx> -#endif - -#ifndef _FLYFRMS_HXX #include <flyfrms.hxx> -#endif -#ifndef _TXTFRM_HXX #include <txtfrm.hxx> -#endif -#ifndef _PAGEFRM_HXX #include <pagefrm.hxx> -#endif -#ifndef _ROWFRM_HXX #include <rowfrm.hxx> -#endif - -#ifndef _LAYOUTER_HXX #include <layouter.hxx> -#endif - -#ifndef _FRMFMT_HXX #include <frmfmt.hxx> -#endif -#ifndef _FMTANCHR_HXX #include <fmtanchr.hxx> -#endif -#ifndef _FMTWRAPINFLUENCEONOBJPOS_HXX #include <fmtwrapinfluenceonobjpos.hxx> -#endif // --> OD 2004-11-03 #114798# -#ifndef _FMTFOLLOWTEXTFLOW_HXX #include <fmtfollowtextflow.hxx> -#endif // <-- - -#ifndef _LAYACT_HXX #include <layact.hxx> -#endif using namespace ::com::sun::star; |