INTEGRATION: CWS changefileheader (1.2.466); FILE MERGED

2008/04/01 15:49:39 thb 1.2.466.3: #i85898# Stripping all external header guards
2008/04/01 12:46:58 thb 1.2.466.2: #i85898# Stripping all external header guards
2008/03/31 14:18:19 rt 1.2.466.1: #i87441# Change license header to LPGL v3.
This commit is contained in:
Rüdiger Timm 2008-04-10 19:32:57 +00:00
parent 8bb78fecbf
commit 001e2e53c0
3 changed files with 54 additions and 96 deletions

View file

@ -1,59 +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: sxcecitm.hxx,v $ * $RCSfile: sxcecitm.hxx,v $
* $Revision: 1.3 $
* *
* $Revision: 1.2 $ * This file is part of OpenOffice.org.
* *
* last change: $Author: vg $ $Date: 2007-04-11 16:31:56 $ * 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 _SXCECITM_HXX #ifndef _SXCECITM_HXX
#define _SXCECITM_HXX #define _SXCECITM_HXX
#ifndef _SFXENUMITEM_HXX //autogen
#include <svtools/eitem.hxx> #include <svtools/eitem.hxx>
#endif
#ifndef _SVDDEF_HXX //autogen
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
#endif
#ifndef _SDYNITM_HXX
#include <svx/sdynitm.hxx> #include <svx/sdynitm.hxx>
#endif
#ifndef _SDMETITM_HXX
#include <svx/sdmetitm.hxx> #include <svx/sdmetitm.hxx>
#endif
#ifndef INCLUDED_SVXDLLAPI_H
#include "svx/svxdllapi.h" #include "svx/svxdllapi.h"
#endif
enum SdrCaptionEscDir {SDRCAPT_ESCHORIZONTAL,SDRCAPT_ESCVERTICAL,SDRCAPT_ESCBESTFIT}; enum SdrCaptionEscDir {SDRCAPT_ESCHORIZONTAL,SDRCAPT_ESCVERTICAL,SDRCAPT_ESCBESTFIT};

View file

@ -1,47 +1,37 @@
/************************************************************************* /*************************************************************************
*
* 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: sxcikitm.hxx,v $ * $RCSfile: sxcikitm.hxx,v $
* $Revision: 1.3 $
* *
* $Revision: 1.2 $ * This file is part of OpenOffice.org.
* *
* last change: $Author: vg $ $Date: 2007-04-11 16:32:50 $ * 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 _SXCIKITM_HXX #ifndef _SXCIKITM_HXX
#define _SXCIKITM_HXX #define _SXCIKITM_HXX
#ifndef _SVDDEF_HXX //autogen
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
#endif
#ifndef _SFXENUMITEM_HXX //autogen
#include <svtools/eitem.hxx> #include <svtools/eitem.hxx>
#endif
enum SdrCircKind {SDRCIRC_FULL, enum SdrCircKind {SDRCIRC_FULL,
SDRCIRC_SECT, SDRCIRC_SECT,

View file

@ -1,51 +1,38 @@
/************************************************************************* /*************************************************************************
*
* 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: sxctitm.hxx,v $ * $RCSfile: sxctitm.hxx,v $
* $Revision: 1.3 $
* *
* $Revision: 1.2 $ * This file is part of OpenOffice.org.
* *
* last change: $Author: vg $ $Date: 2007-04-11 16:33:14 $ * 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 _SXCTITM_HXX #ifndef _SXCTITM_HXX
#define _SXCTITM_HXX #define _SXCTITM_HXX
#ifndef _SFXENUMITEM_HXX //autogen
#include <svtools/eitem.hxx> #include <svtools/eitem.hxx>
#endif
#ifndef _SVDDEF_HXX //autogen
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
#endif
#ifndef INCLUDED_SVXDLLAPI_H
#include "svx/svxdllapi.h" #include "svx/svxdllapi.h"
#endif
enum SdrCaptionType {SDRCAPT_TYPE1,SDRCAPT_TYPE2,SDRCAPT_TYPE3,SDRCAPT_TYPE4}; enum SdrCaptionType {SDRCAPT_TYPE1,SDRCAPT_TYPE2,SDRCAPT_TYPE3,SDRCAPT_TYPE4};