diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 21:22:45 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 21:22:45 +0000 |
commit | ae354274459e3b493f29e058feda8b2ada620468 (patch) | |
tree | 1da445aea9451dd99eac75a120aa885d850caa29 /svx/source/dialog/dlgctrl.cxx | |
parent | INTEGRATION: CWS changefileheader (1.17.162); FILE MERGED (diff) | |
download | core-ae354274459e3b493f29e058feda8b2ada620468.tar.gz core-ae354274459e3b493f29e058feda8b2ada620468.zip |
INTEGRATION: CWS changefileheader (1.33.354); FILE MERGED
2008/04/01 15:50:18 thb 1.33.354.3: #i85898# Stripping all external header guards
2008/04/01 12:48:10 thb 1.33.354.2: #i85898# Stripping all external header guards
2008/03/31 14:19:23 rt 1.33.354.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'svx/source/dialog/dlgctrl.cxx')
-rw-r--r-- | svx/source/dialog/dlgctrl.cxx | 77 |
1 files changed, 18 insertions, 59 deletions
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 2287da0e31b4..c89cc2de0bea 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.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: dlgctrl.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.34 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: kz $ $Date: 2008-04-03 16:57:06 $ + * $RCSfile: dlgctrl.cxx,v $ + * $Revision: 1.35 $ * - * 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. * ************************************************************************/ @@ -37,10 +32,7 @@ #include "precompiled_svx.hxx" // include --------------------------------------------------------------- - -#ifndef _SHL_HXX //autogen #include <tools/shl.hxx> -#endif #ifndef _APP_HXX //autogen #include <vcl/svapp.hxx> #endif @@ -53,37 +45,16 @@ #include "accessibility.hrc" #include <svx/dlgctrl.hxx> #include <svx/dialmgr.hxx> - -#ifndef _TL_POLY_HXX #include <tools/poly.hxx> -#endif -#ifndef _SV_REGION_HXX #include <vcl/region.hxx> -#endif -#ifndef _SV_GRADIENT_HXX #include <vcl/gradient.hxx> -#endif -#ifndef _SV_HATCH_HXX #include <vcl/hatch.hxx> -#endif - -#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX #include <svtools/colorcfg.hxx> -#endif #include "svxrectctaccessiblecontext.hxx" - -#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_ #include <com/sun/star/lang/XUnoTunnel.hpp> -#endif - -#ifndef _BGFX_POINT_B2DPOINT_HXX #include <basegfx/point/b2dpoint.hxx> -#endif - -#ifndef _BGFX_POLYGON_B2DPOLYGON_HXX #include <basegfx/polygon/b2dpolygon.hxx> -#endif #define OUTPUT_DRAWMODE_COLOR (DRAWMODE_DEFAULT) #define OUTPUT_DRAWMODE_CONTRAST (DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT) @@ -1929,22 +1900,10 @@ void LineEndLB::Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp, |* SvxXLinePreview::SvxXLinePreview() |* *************************************************************************/ - -#ifndef _SVDMODEL_HXX #include <svx/svdmodel.hxx> -#endif - -#ifndef _SVDOPATH_HXX #include <svx/svdopath.hxx> -#endif - -#ifndef _SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> -#endif - -#ifndef _SDR_CONTACT_DISPLAYINFO_HXX #include <svx/sdr/contact/displayinfo.hxx> -#endif SvxXLinePreview::SvxXLinePreview( Window* pParent, const ResId& rResId, XOutputDevice* pXOut ) : Control( pParent, rResId ), |