From 44ee6a05c4453ba47d87a7539517035877302024 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 11 Apr 2008 07:44:22 +0000 Subject: INTEGRATION: CWS changefileheader (1.2.136); FILE MERGED 2008/04/01 10:49:25 thb 1.2.136.2: #i85898# Stripping all external header guards 2008/03/28 16:34:53 rt 1.2.136.1: #i87441# Change license header to LPGL v3. --- canvas/inc/canvas/base/doublebitmapbase.hxx | 46 +++++++++++----------------- canvas/inc/canvas/base/floatbitmapbase.hxx | 46 +++++++++++----------------- canvas/inc/canvas/base/integerbitmapbase.hxx | 46 +++++++++++----------------- 3 files changed, 54 insertions(+), 84 deletions(-) (limited to 'canvas/inc') diff --git a/canvas/inc/canvas/base/doublebitmapbase.hxx b/canvas/inc/canvas/base/doublebitmapbase.hxx index 48600e0c831c..b7b607cde8ec 100644 --- a/canvas/inc/canvas/base/doublebitmapbase.hxx +++ b/canvas/inc/canvas/base/doublebitmapbase.hxx @@ -1,48 +1,38 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: doublebitmapbase.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: kz $ $Date: 2005-11-02 12:42:54 $ + * $RCSfile: doublebitmapbase.hxx,v $ + * $Revision: 1.3 $ * - * 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 + * + * for a copy of the LGPLv3 License. * ************************************************************************/ #ifndef INCLUDED_CANVAS_DOUBLEBITMAPBASE_HXX #define INCLUDED_CANVAS_DOUBLEBITMAPBASE_HXX -#ifndef _COM_SUN_STAR_RENDERING_XIEEEDOUBLEBITMAP_HPP_ #include -#endif - -#ifndef INCLUDED_CANVAS_BITMAPCANVASBASE_HXX #include -#endif namespace canvas diff --git a/canvas/inc/canvas/base/floatbitmapbase.hxx b/canvas/inc/canvas/base/floatbitmapbase.hxx index 4a4d90faa6ea..d464778e2a35 100644 --- a/canvas/inc/canvas/base/floatbitmapbase.hxx +++ b/canvas/inc/canvas/base/floatbitmapbase.hxx @@ -1,48 +1,38 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: floatbitmapbase.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: kz $ $Date: 2005-11-02 12:43:04 $ + * $RCSfile: floatbitmapbase.hxx,v $ + * $Revision: 1.3 $ * - * 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 + * + * for a copy of the LGPLv3 License. * ************************************************************************/ #ifndef INCLUDED_CANVAS_FLOATBITMAPBASE_HXX #define INCLUDED_CANVAS_FLOATBITMAPBASE_HXX -#ifndef _COM_SUN_STAR_RENDERING_XIEEEFLOATBITMAP_HPP_ #include -#endif - -#ifndef INCLUDED_CANVAS_BITMAPCANVASBASE_HXX #include -#endif namespace canvas diff --git a/canvas/inc/canvas/base/integerbitmapbase.hxx b/canvas/inc/canvas/base/integerbitmapbase.hxx index e77cfe3f0a28..d720b577a42a 100644 --- a/canvas/inc/canvas/base/integerbitmapbase.hxx +++ b/canvas/inc/canvas/base/integerbitmapbase.hxx @@ -1,48 +1,38 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: integerbitmapbase.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: kz $ $Date: 2005-11-02 12:43:30 $ + * $RCSfile: integerbitmapbase.hxx,v $ + * $Revision: 1.3 $ * - * 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 + * + * for a copy of the LGPLv3 License. * ************************************************************************/ #ifndef INCLUDED_CANVAS_INTEGERBITMAPBASE_HXX #define INCLUDED_CANVAS_INTEGERBITMAPBASE_HXX -#ifndef _COM_SUN_STAR_RENDERING_XINTEGERBITMAP_HPP_ #include -#endif - -#ifndef INCLUDED_CANVAS_BITMAPCANVASBASE_HXX #include -#endif namespace canvas -- cgit v1.2.3