summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/source/core/unocore/unodraw.cxx112
1 files changed, 18 insertions, 94 deletions
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 0a2555a29bf8..6d46e77b8276 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.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: unodraw.cxx,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
*
- * $Revision: 1.79 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * last change: $Author: kz $ $Date: 2008-03-05 17:31:57 $
+ * $RCSfile: unodraw.cxx,v $
+ * $Revision: 1.80 $
*
- * 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,117 +35,48 @@
#include <cmdid.h>
#include <unomid.h>
-#ifndef _UNODRAW_HXX
#include <unodraw.hxx>
-#endif
-#ifndef _UNOCOLL_HXX
#include <unocoll.hxx>
-#endif
-#ifndef _UNOFRAME_HXX
#include <unoframe.hxx>
-#endif
-#ifndef _UNOPRNMS_HXX
#include <unoprnms.hxx>
-#endif
-#ifndef _SVX_UNOPRNMS_HXX
#include <svx/unoprnms.hxx>
-#endif
#include <swunohelper.hxx>
-#ifndef _DOC_HXX //autogen
#include <doc.hxx>
-#endif
#include <fmtflcnt.hxx>
#include <txtatr.hxx>
-#ifndef _SWDOCSH_HXX
#include <docsh.hxx>
-#endif
-#ifndef _UNOMAP_HXX
#include <unomap.hxx>
-#endif
-#ifndef _UNOPORT_HXX
#include <unoport.hxx>
-#endif
-#ifndef _UNOCRSR_HXX
#include <unocrsr.hxx>
-#endif
-#ifndef _SWUNDO_HXX //autogen
#include <swundo.hxx>
-#endif
-#ifndef _DFLYOBJ_HXX
#include <dflyobj.hxx>
-#endif
-#ifndef _NDTXT_HXX //autogen
#include <ndtxt.hxx>
-#endif
-#ifndef _SVDVIEW_HXX //autogen
#include <svx/svdview.hxx>
-#endif
-#ifndef _SVX_UNOSHAPE_HXX
#include <svx/unoshape.hxx>
-#endif
-#ifndef _DCONTACT_HXX
#include <dcontact.hxx>
-#endif
-#ifndef _SVX_FMGLOB_HXX
#include <svx/fmglob.hxx>
-#endif
-#ifndef _FMTORNT_HXX //autogen
#include <fmtornt.hxx>
-#endif
-#ifndef _FMTANCHR_HXX //autogen
#include <fmtanchr.hxx>
-#endif
-#ifndef _FMTSRND_HXX //autogen
#include <fmtsrnd.hxx>
-#endif
// OD 2004-04-21 #i26791#
-#ifndef _FMTFOLLOWTEXTFLOW_HXX
#include <fmtfollowtextflow.hxx>
-#endif
-#ifndef _ROOTFRM_HXX //autogen
#include <rootfrm.hxx>
-#endif
-
-#ifndef _SVX_LRSPITEM_HXX //autogen
#include <svx/lrspitem.hxx>
-#endif
-#ifndef _SVX_ULSPITEM_HXX //autogen
#include <svx/ulspitem.hxx>
-#endif
-#ifndef _CRSTATE_HXX //autogen
#include <crstate.hxx>
-#endif
-#ifndef _VOS_MUTEX_HXX_ //autogen
#include <vos/mutex.hxx>
-#endif
-#ifndef _COMPHELPER_EXTRACT_HXX_
#include <comphelper/extract.hxx>
-#endif
-#ifndef _COMPHELPER_STLTYPES_HXX_
#include <comphelper/stl_types.hxx>
-#endif
-#ifndef _E3D_SCENE3D_HXX
#include <svx/scene3d.hxx>
-#endif
#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPPP_
#include <com/sun/star/beans/PropertyAttribute.hpp>
#endif
-#ifndef _COM_SUN_STAR_DRAWING_XDRAWPAGESUPPLIER_HPP_
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_TEXT_HORIORIENTATION_HPP_
#include <com/sun/star/text/HoriOrientation.hpp>
-#endif
-#ifndef _COM_SUN_STAR_TEXT_VERTORIENTATION_HPP_
#include <com/sun/star/text/VertOrientation.hpp>
-#endif
-#ifndef _BGFX_NUMERIC_FTOOLS_HXX
#include <basegfx/numeric/ftools.hxx>
-#endif
// OD 2004-05-05 #i28701#
-#ifndef _FMTWRAPINFLUENCEONOBJPOS_HXX
#include <fmtwrapinfluenceonobjpos.hxx>
-#endif
// --> OD 2004-11-10 #i35007#
#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP
#include <com/sun/star/text/TextContentAnchorType.hpp>
@@ -158,9 +84,7 @@
// <--
// --> OD 2005-03-10 #i44334#, #i44681#
// --> OD 2007-01-03 #i73079# - use correct matrix type
-#ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX
#include <basegfx/matrix/b2dhommatrix.hxx>
-#endif
// <--
#include <vcl/svapp.hxx>