INTEGRATION: CWS changefileheader (1.5.80); FILE MERGED

2008/04/01 15:10:02 thb 1.5.80.3: #i85898# Stripping all external header guards
2008/04/01 12:27:50 thb 1.5.80.2: #i85898# Stripping all external header guards
2008/03/31 13:07:07 rt 1.5.80.1: #i87441# Change license header to LPGL v3.
This commit is contained in:
Rüdiger Timm
2008-04-11 09:05:47 +00:00
parent c98578896e
commit 03ebebd4d6
2 changed files with 36 additions and 65 deletions

View File

@@ -1,59 +1,42 @@
/************************************************************************* /*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2008 by Sun Microsystems, Inc.
* *
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: bitmapcanvas.hxx,v $ * $RCSfile: bitmapcanvas.hxx,v $
* $Revision: 1.6 $
* *
* $Revision: 1.5 $ * This file is part of OpenOffice.org.
* *
* last change: $Author: rt $ $Date: 2005-09-08 08:12:36 $ * 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.
* *
* The Contents of this file are made available subject to * OpenOffice.org is distributed in the hope that it will be useful,
* the terms of GNU Lesser General Public License Version 2.1.
*
*
* 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 * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* Lesser General Public License for more details. * GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public License
* License along with this library; if not, write to the Free Software * version 3 along with OpenOffice.org. If not, see
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * <http://www.openoffice.org/license.html>
* MA 02111-1307 USA * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
#ifndef _CPPCANVAS_BITMAPCANVAS_HXX #ifndef _CPPCANVAS_BITMAPCANVAS_HXX
#define _CPPCANVAS_BITMAPCANVAS_HXX #define _CPPCANVAS_BITMAPCANVAS_HXX
#ifndef _SAL_TYPES_H_
#include <sal/types.h> #include <sal/types.h>
#endif
#ifndef _OSL_DIAGNOSE_H_
#include <osl/diagnose.h> #include <osl/diagnose.h>
#endif
#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#endif
#ifndef _BGFX_VECTOR_B2ISIZE_HXX
#include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2isize.hxx>
#endif
#ifndef _CPPCANVAS_CANVAS_HXX
#include <cppcanvas/canvas.hxx> #include <cppcanvas/canvas.hxx>
#endif
/* Definition of BitmapCanvas */ /* Definition of BitmapCanvas */

View File

@@ -1,52 +1,40 @@
/************************************************************************* /*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2008 by Sun Microsystems, Inc.
* *
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: polypolygon.hxx,v $ * $RCSfile: polypolygon.hxx,v $
* $Revision: 1.6 $
* *
* $Revision: 1.5 $ * This file is part of OpenOffice.org.
* *
* last change: $Author: rt $ $Date: 2005-09-08 08:14:31 $ * 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.
* *
* The Contents of this file are made available subject to * OpenOffice.org is distributed in the hope that it will be useful,
* the terms of GNU Lesser General Public License Version 2.1.
*
*
* 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 * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* Lesser General Public License for more details. * GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public License
* License along with this library; if not, write to the Free Software * version 3 along with OpenOffice.org. If not, see
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * <http://www.openoffice.org/license.html>
* MA 02111-1307 USA * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
#ifndef _CPPCANVAS_POLYPOLYGON_HXX #ifndef _CPPCANVAS_POLYPOLYGON_HXX
#define _CPPCANVAS_POLYPOLYGON_HXX #define _CPPCANVAS_POLYPOLYGON_HXX
#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#endif
#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#endif
#ifndef _CPPCANVAS_CANVASGRAPHIC_HXX
#include <cppcanvas/canvasgraphic.hxx> #include <cppcanvas/canvasgraphic.hxx>
#endif
namespace basegfx namespace basegfx
{ {