summaryrefslogtreecommitdiff
path: root/cppcanvas/source/wrapper
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-04-11 09:20:59 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-04-11 09:20:59 +0000
commit937fc6c21699bad8be7a0731b783177e7fe4a715 (patch)
tree8e8876d7ca17be633785d80f1994f5e4e3a20a2b /cppcanvas/source/wrapper
parentc680f99cf57e12cae220d122505135282bbb5880 (diff)
INTEGRATION: CWS changefileheader (1.5.80); FILE MERGED
2008/04/01 15:10:07 thb 1.5.80.3: #i85898# Stripping all external header guards 2008/04/01 12:27:51 thb 1.5.80.2: #i85898# Stripping all external header guards 2008/03/31 13:07:09 rt 1.5.80.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'cppcanvas/source/wrapper')
-rw-r--r--cppcanvas/source/wrapper/implfont.hxx46
1 files changed, 18 insertions, 28 deletions
diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx
index 9713b2534e87..e1e9b89d284f 100644
--- a/cppcanvas/source/wrapper/implfont.hxx
+++ b/cppcanvas/source/wrapper/implfont.hxx
@@ -1,44 +1,37 @@
/*************************************************************************
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * $RCSfile: implfont.hxx,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
*
- * $Revision: 1.5 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * last change: $Author: rt $ $Date: 2005-09-08 08:28:49 $
+ * $RCSfile: implfont.hxx,v $
+ * $Revision: 1.6 $
*
- * 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.
*
************************************************************************/
#ifndef _CPPCANVAS_IMPLFONT_HXX
#define _CPPCANVAS_IMPLFONT_HXX
-#ifndef _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>
@@ -47,10 +40,7 @@
#ifndef _COM_SUN_STAR_RENDERING_XCANVAS_HPP__
#include <com/sun/star/rendering/XCanvas.hpp>
#endif
-
-#ifndef _CPPCANVAS_FONT_HXX
#include <cppcanvas/font.hxx>
-#endif
namespace rtl
{