summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-04-10 20:49:46 +0000
committerRüdiger Timm <rt@openoffice.org>2008-04-10 20:49:46 +0000
commit929646f7ae661c5aef4f2cb2c4b1d8c6a412ea3a (patch)
tree9fa66d0490bd0171924ac47873a2c49ec118f2e0 /svx
parenta5b2750607062a562796c717b5b134ab886a15df (diff)
INTEGRATION: CWS changefileheader (1.18.340); FILE MERGED
2008/04/01 15:50:11 thb 1.18.340.3: #i85898# Stripping all external header guards 2008/04/01 12:48:02 thb 1.18.340.2: #i85898# Stripping all external header guards 2008/03/31 14:19:17 rt 1.18.340.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'svx')
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeFontWork.cxx96
1 files changed, 19 insertions, 77 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index b24e6bf5df..4c96b9df8d 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -1,104 +1,56 @@
/*************************************************************************
*
- * 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: EnhancedCustomShapeFontWork.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * $Revision: 1.18 $
+ * $RCSfile: EnhancedCustomShapeFontWork.cxx,v $
+ * $Revision: 1.19 $
*
- * last change: $Author: obo $ $Date: 2007-07-18 10:52:27 $
+ * 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 _ENHANCEDCUSTOMSHAPEFONTWORK_HXX
#include "EnhancedCustomShapeFontWork.hxx"
-#endif
-#ifndef _SOLAR_H
#include <tools/solar.h> // UINTXX
-#endif
-#ifndef _XOUTX_HXX
#include <svx/xoutx.hxx>
-#endif
-#ifndef _SVDDEF_HXX
#include <svx/svddef.hxx>
-#endif
-#ifndef _SVDOGRP_HXX
#include <svx/svdogrp.hxx>
-#endif
-#ifndef _SVDOPATH_HXX
#include <svx/svdopath.hxx>
-#endif
-#ifndef _SV_METRIC_HXX
#include <vcl/metric.hxx>
-#endif
-#ifndef _SVDPAGE_HXX
#include <svx/svdpage.hxx>
-#endif
-#ifndef _SDASITM_HXX
#include <svx/sdasitm.hxx>
-#endif
-#ifndef _SDASAITM_HXX
#include <svx/sdasaitm.hxx>
-#endif
-#ifndef _SDTFSITM_HXX
#include <svx/sdtfsitm.hxx>
-#endif
-#ifndef _SV_VIRDEV_HXX //autogen
#include <vcl/virdev.hxx>
-#endif
-#ifndef _SVDITER_HXX
#include <svditer.hxx>
-#endif
-#ifndef _SV_METRIC_HXX
#include <vcl/metric.hxx>
-#endif
-#ifndef _EEITEM_HXX //autogen
#include <svx/eeitem.hxx>
-#endif
-#ifndef _SVX_FRMDIRITEM_HXX
#include <svx/frmdiritem.hxx>
-#endif
-#ifndef _SVX_FONTITEM_HXX //autogen
#include <fontitem.hxx>
-#endif
-#ifndef _SVX_POSTITEM_HXX
#include <svx/postitem.hxx>
-#endif
-#ifndef _SVX_WGHTITEM_HXX
#include <svx/wghtitem.hxx>
-#endif
-#ifndef _SVX_CHARSCALEITEM_HXX
#include <svx/charscaleitem.hxx>
-#endif
-#ifndef _ENHANCED_CUSTOMSHAPE_TYPE_NAMES_HXX
#include "EnhancedCustomShapeTypeNames.hxx"
-#endif
#include <svx/svdorect.hxx>
#include <svx/svdoashp.hxx>
#include <svx/outliner.hxx>
@@ -109,26 +61,16 @@
#include <vector>
#include <numeric>
#include <algorithm>
-
-#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
#include <comphelper/processfactory.hxx>
-#endif
#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
#include <com/sun/star/i18n/ScriptType.hdl>
#endif
-#ifndef _BGFX_POLYPOLYGON_B2DPOLYGONTOOLS_HXX
#include <basegfx/polygon/b2dpolypolygontools.hxx>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
#ifndef _COM_SUN_STAR_I18N_CHARACTERITERATORMODE_HDL_
#include <com/sun/star/i18n/CharacterIteratorMode.hdl>
#endif
-
-#ifndef _BGFX_POLYGON_B2DPOLYGONTOOLS_HXX
#include <basegfx/polygon/b2dpolygontools.hxx>
-#endif
using namespace com::sun::star;
using namespace com::sun::star::uno;