diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 12:05:14 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 12:05:14 +0000 |
commit | b99951320e4e56b4064879d42098fdcb56b7b62a (patch) | |
tree | 18d13a4a5c0bea51a623d61a4e5a7bcae631abb1 /writerfilter/source/dmapper/GraphicImport.cxx | |
parent | INTEGRATION: CWS changefileheader (1.5.20); FILE MERGED (diff) | |
download | core-b99951320e4e56b4064879d42098fdcb56b7b62a.tar.gz core-b99951320e4e56b4064879d42098fdcb56b7b62a.zip |
INTEGRATION: CWS changefileheader (1.11.4); FILE MERGED
2008/04/01 13:02:27 thb 1.11.4.2: #i85898# Stripping all external header guards
2008/03/28 15:52:59 rt 1.11.4.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'writerfilter/source/dmapper/GraphicImport.cxx')
-rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 57 |
1 files changed, 18 insertions, 39 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index d1ceeba5403a..1633c95ddd1b 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.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: GraphicImport.cxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.11 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: kz $ $Date: 2008-03-05 16:51:03 $ + * $RCSfile: GraphicImport.cxx,v $ + * $Revision: 1.12 $ * - * 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. * ************************************************************************/ @@ -49,27 +44,15 @@ //#ifndef _COM_SUN_STAR_DRAWING_POINTSEQUENCESEQUENCE_HPP_ //#include <com/sun/star/drawing/PointSequenceSequence.hpp> //#endif -#ifndef _COM_SUN_STAR_GRAPHIC_XGRAPHICPROVIDER_HPP_ #include <com/sun/star/graphic/XGraphicProvider.hpp> -#endif #ifndef _COM_SUN_STAR_GRAPHIC_XGRAPHIC_HPP_ #include <com/sun/star/graphic/XGraphicr.hpp> #endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_TABLE_BORDERLINE_HPP_ #include <com/sun/star/table/BorderLine.hpp> -#endif -#ifndef _COM_SUN_STAR_TEXT_GRAPHICCROP_HPP_ #include <com/sun/star/text/GraphicCrop.hpp> -#endif -#ifndef _COM_SUN_STAR_TEXT_XTEXTCONTENT_HPP_ #include <com/sun/star/text/XTextContent.hpp> -#endif -#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP_ #include <com/sun/star/text/TextContentAnchorType.hpp> -#endif #ifndef _COM_SUN_STAR_TEXT_HORIORIENTATION_HDL_ #include <com/sun/star/text/HoriOrientation.hpp> #endif @@ -79,12 +62,8 @@ #ifndef _COM_SUN_STAR_TEXT_VERTORIENTATION_HDL_ #include <com/sun/star/text/VertOrientation.hpp> #endif -#ifndef _COM_SUN_STAR_TEXT_WRAPTEXTMODE_HPP_ #include <com/sun/star/text/WrapTextMode.hpp> -#endif -#ifndef _COM_SUN_STAR_DRAWING_XSHAPE_HPP_ #include <com/sun/star/drawing/XShape.hpp> -#endif #include <rtl/ustrbuf.hxx> |