diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 18:42:21 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-10 18:42:21 +0000 |
commit | 93ac0713d32b2c30cecf23820e197b09de31d8e0 (patch) | |
tree | f132ca38c45ce84e94d87a683558c9520063574d | |
parent | 6618d1aab7c5e46b82834b6bd2ff0dff79724d5f (diff) |
INTEGRATION: CWS changefileheader (1.2.466); FILE MERGED
2008/04/01 15:49:33 thb 1.2.466.3: #i85898# Stripping all external header guards
2008/04/01 12:46:40 thb 1.2.466.2: #i85898# Stripping all external header guards
2008/03/31 14:18:12 rt 1.2.466.1: #i87441# Change license header to LPGL v3.
-rw-r--r-- | svx/inc/svx/fntctrl.hxx | 50 | ||||
-rw-r--r-- | svx/inc/svx/fontwork.hxx | 56 | ||||
-rw-r--r-- | svx/inc/svx/fontworkbar.hxx | 53 | ||||
-rw-r--r-- | svx/inc/svx/framelink.hxx | 53 |
4 files changed, 76 insertions, 136 deletions
diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx index ff7ce20938..2d5334a247 100644 --- a/svx/inc/svx/fntctrl.hxx +++ b/svx/inc/svx/fntctrl.hxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. * - * $RCSfile: fntctrl.hxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.2 $ + * $RCSfile: fntctrl.hxx,v $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2007-04-11 15:52:50 $ + * This file is part of OpenOffice.org. * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * 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. * + * 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). * - * 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 - * 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 _SVX_FNTCTRL_HXX @@ -37,16 +32,9 @@ // include --------------------------------------------------------------- -#ifndef _WINDOW_HXX //autogen #include <vcl/window.hxx> -#endif -#ifndef _SVX_SVXFONT_HXX //autogen #include <svx/svxfont.hxx> -#endif - -#ifndef INCLUDED_SVXDLLAPI_H #include "svx/svxdllapi.h" -#endif // forward --------------------------------------------------------------- diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx index 6dcde854bd..8446d73ee3 100644 --- a/svx/inc/svx/fontwork.hxx +++ b/svx/inc/svx/fontwork.hxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. * - * $RCSfile: fontwork.hxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.2 $ + * $RCSfile: fontwork.hxx,v $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2007-04-11 15:53:12 $ + * This file is part of OpenOffice.org. * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * 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. * + * 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). * - * 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 - * 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 _SVX_FONTWORK_HXX @@ -43,25 +38,12 @@ #ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> #endif -#ifndef _VALUESET_HXX //autogen #include <svtools/valueset.hxx> -#endif -#ifndef _SFXDOCKWIN_HXX //autogen #include <sfx2/dockwin.hxx> -#endif -#ifndef _SFXCTRLITEM_HXX //autogen #include <sfx2/ctrlitem.hxx> -#endif -#ifndef _XENUM_HXX #include <svx/xenum.hxx> -#endif -#ifndef _SVX_DLG_CTRL_HXX #include <svx/dlgctrl.hxx> -#endif - -#ifndef INCLUDED_SVXDLLAPI_H #include "svx/svxdllapi.h" -#endif // forward --------------------------------------------------------------- diff --git a/svx/inc/svx/fontworkbar.hxx b/svx/inc/svx/fontworkbar.hxx index 5ac1f3efdd..e49cd33afd 100644 --- a/svx/inc/svx/fontworkbar.hxx +++ b/svx/inc/svx/fontworkbar.hxx @@ -1,55 +1,40 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. * - * $RCSfile: fontworkbar.hxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.2 $ + * $RCSfile: fontworkbar.hxx,v $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2007-04-11 15:53:23 $ + * This file is part of OpenOffice.org. * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * 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. * + * 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). * - * 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 - * 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 _SVX_FONTWORK_BAR_HXX #define _SVX_FONTWORK_BAR_HXX -#ifndef _SFX_SHELL_HXX //autogen #include <sfx2/shell.hxx> -#endif -#ifndef _SFXMODULE_HXX //autogen #include <sfx2/module.hxx> -#endif - -#ifndef _SVX_IFACEIDS_HXX #include <svx/ifaceids.hxx> -#endif - -#ifndef INCLUDED_SVXDLLAPI_H #include "svx/svxdllapi.h" -#endif class SfxViewShell; class SdrView; diff --git a/svx/inc/svx/framelink.hxx b/svx/inc/svx/framelink.hxx index 6aea0149ab..e6263606b8 100644 --- a/svx/inc/svx/framelink.hxx +++ b/svx/inc/svx/framelink.hxx @@ -1,35 +1,30 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. * - * $RCSfile: framelink.hxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.2 $ + * $RCSfile: framelink.hxx,v $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2007-04-11 15:54:22 $ + * This file is part of OpenOffice.org. * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * 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. * + * 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). * - * 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 - * 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. * ************************************************************************/ @@ -37,20 +32,10 @@ #define SVX_FRAMELINK_HXX #include <algorithm> - -#ifndef _SAL_TYPES_H_ #include <sal/types.h> -#endif -#ifndef _SV_GEN_HXX #include <tools/gen.hxx> -#endif -#ifndef _TOOLS_COLOR_HXX #include <tools/color.hxx> -#endif - -#ifndef INCLUDED_SVXDLLAPI_H #include "svx/svxdllapi.h" -#endif class OutputDevice; class SvxBorderLine; |