diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-04-10 17:20:55 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-10 17:20:55 +0000 |
commit | c22eb2a169cb47f529720963683e5b9effe8d24a (patch) | |
tree | 0773380d7e5796a3e05d275450e79c8695b6cde6 /sd/inc/sdpage.hxx | |
parent | 2ac4951b94c18494879d74ca46cdfc8cfc5073ab (diff) |
INTEGRATION: CWS changefileheader (1.31.22); FILE MERGED
2008/04/01 15:33:47 thb 1.31.22.3: #i85898# Stripping all external header guards
2008/04/01 12:38:23 thb 1.31.22.2: #i85898# Stripping all external header guards
2008/03/31 13:56:41 rt 1.31.22.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'sd/inc/sdpage.hxx')
-rw-r--r-- | sd/inc/sdpage.hxx | 62 |
1 files changed, 18 insertions, 44 deletions
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index f18a4abe989d..726592f9caff 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: sdpage.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.31 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: kz $ $Date: 2008-03-06 16:24:28 $ + * $RCSfile: sdpage.hxx,v $ + * $Revision: 1.32 $ * - * 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. * ************************************************************************/ @@ -44,45 +39,24 @@ #include <functional> #define INCLUDED_FUNCTIONAL #endif - -#ifndef _COM_SUN_STAR_DRAWING_XDRAWPAGE_HPP_ #include <com/sun/star/drawing/XDrawPage.hpp> -#endif - -#ifndef _COM_SUN_STAR_PRESENTATION_FADEEFFECT_HPP_ #include <com/sun/star/presentation/FadeEffect.hpp> -#endif #include <list> #include <functional> #include <vector> - -#ifndef _SVDOBJ_HXX //autogen #include <svx/svdobj.hxx> -#endif #ifndef _FM_FMPAGE_HXX //autogen #include <svx/fmpage.hxx> #endif - -#ifndef _SD_FADEDEF_H #include "fadedef.h" -#endif -#ifndef _SD_DIADEF_H #include "diadef.h" -#endif #ifndef _PRESENTATION #include "pres.hxx" #endif -#ifndef _SHAPELIST_HXX #include "shapelist.hxx" -#endif -#ifndef _SD_SCOPELOCK_HXX #include "misc/scopelock.hxx" -#endif - -#ifndef INCLUDED_SDDLLAPI_H #include "sddllapi.h" -#endif namespace com { namespace sun { namespace star { namespace animations { class XAnimationNode; |