From 207bcb540dcb9d9a784bdb6f032b4503fa662b10 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Mon, 10 May 2004 14:40:21 +0000 Subject: INTEGRATION: CWS dialogdiet01 (1.1.2); FILE ADDED 2004/04/22 02:06:43 mwu 1.1.2.1: dialogdiet01 m33 sd 20040422 --- sd/inc/prlayout.hxx | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 sd/inc/prlayout.hxx (limited to 'sd/inc/prlayout.hxx') diff --git a/sd/inc/prlayout.hxx b/sd/inc/prlayout.hxx new file mode 100644 index 000000000000..9d44a5de25ae --- /dev/null +++ b/sd/inc/prlayout.hxx @@ -0,0 +1,90 @@ +/************************************************************************* + * + * $RCSfile: prlayout.hxx,v $ + * + * $Revision: 1.2 $ + * + * last change: $Author: hr $ $Date: 2004-05-10 15:40:21 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 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 + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +/************************************************************************* +|* Enthielt frueher auch die Klasse SdPresentationLayoutDlg (wird jetzt nicht +|* mehr benoetigt). Dieses File ist auf ungeklaerte Weise aus dem PVCS +|* verschwunden und wird jetzt neu eingecheckt und enthaelt nur noch den enum. +\************************************************************************/ + +#ifndef _SD_PRLAYOUT_HXX_ +#define _SD_PRLAYOUT_HXX_ + +enum PresentationObjects +{ + PO_TITLE, + PO_BACKGROUND, + PO_BACKGROUNDOBJECTS, + PO_OUTLINE_1, + PO_OUTLINE_2, + PO_OUTLINE_3, + PO_OUTLINE_4, + PO_OUTLINE_5, + PO_OUTLINE_6, + PO_OUTLINE_7, + PO_OUTLINE_8, + PO_OUTLINE_9, + PO_NOTES, + PO_SUBTITLE +}; + +#endif // _SD_PRLAYOUT_HXX_ + -- cgit From 8d28255ec5b067f77ac230abaef62faf10c978de Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 9 Sep 2005 01:57:03 +0000 Subject: INTEGRATION: CWS ooo19126 (1.2.486); FILE MERGED 2005/09/05 13:19:57 rt 1.2.486.1: #i54170# Change license header: remove SISSL --- sd/inc/prlayout.hxx | 68 +++++++++++++++++------------------------------------ 1 file changed, 21 insertions(+), 47 deletions(-) (limited to 'sd/inc/prlayout.hxx') diff --git a/sd/inc/prlayout.hxx b/sd/inc/prlayout.hxx index 9d44a5de25ae..d1d5ea996cd9 100644 --- a/sd/inc/prlayout.hxx +++ b/sd/inc/prlayout.hxx @@ -1,61 +1,35 @@ /************************************************************************* * - * $RCSfile: prlayout.hxx,v $ - * - * $Revision: 1.2 $ - * - * last change: $Author: hr $ $Date: 2004-05-10 15:40:21 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses - * - * - GNU Lesser General Public License Version 2.1 - * - Sun Industry Standards Source License Version 1.1 + * OpenOffice.org - a multi-platform office productivity suite * - * Sun Microsystems Inc., October, 2000 - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2000 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 + * $RCSfile: prlayout.hxx,v $ * + * $Revision: 1.3 $ * - * Sun Industry Standards Source License Version 1.1 - * ================================================= - * The contents of this file are subject to the Sun Industry Standards - * Source License Version 1.1 (the "License"); You may not use this file - * except in compliance with the License. You may obtain a copy of the - * License at http://www.openoffice.org/license.html. + * last change: $Author: rt $ $Date: 2005-09-09 02:57:03 $ * - * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, - * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. - * See the License for the specific provisions governing your rights and - * obligations concerning the Software. + * The Contents of this file are made available subject to + * the terms of GNU Lesser General Public License Version 2.1. * - * The Initial Developer of the Original Code is: Sun Microsystems, Inc. * - * Copyright: 2000 by Sun Microsystems, Inc. + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2005 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA * - * All Rights Reserved. + * 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. * - * Contributor(s): _______________________________________ + * 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 * ************************************************************************/ -- cgit From fc5a8f54e530a8418165441a489b58d1e4ece6b6 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Thu, 10 Apr 2008 17:16:12 +0000 Subject: INTEGRATION: CWS changefileheader (1.3.624); FILE MERGED 2008/03/31 13:56:40 rt 1.3.624.1: #i87441# Change license header to LPGL v3. --- sd/inc/prlayout.hxx | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) (limited to 'sd/inc/prlayout.hxx') diff --git a/sd/inc/prlayout.hxx b/sd/inc/prlayout.hxx index d1d5ea996cd9..f29631162364 100644 --- a/sd/inc/prlayout.hxx +++ b/sd/inc/prlayout.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: prlayout.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.3 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2005-09-09 02:57:03 $ + * $RCSfile: prlayout.hxx,v $ + * $Revision: 1.4 $ * - * 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 + * + * for a copy of the LGPLv3 License. * ************************************************************************/ -- cgit From 9e19ff00c708a9dbcc49f924e795d8a7b418a95d Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 12 Feb 2010 15:01:35 +0100 Subject: changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) --- sd/inc/prlayout.hxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'sd/inc/prlayout.hxx') diff --git a/sd/inc/prlayout.hxx b/sd/inc/prlayout.hxx index f29631162364..87bce53b1c8c 100644 --- a/sd/inc/prlayout.hxx +++ b/sd/inc/prlayout.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: prlayout.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify -- cgit From 55ae7b1537e8964bbd46b54588a84f32342a951a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 27 Oct 2010 12:53:26 +0100 Subject: add modelines to .hxx files as well --- sd/inc/prlayout.hxx | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sd/inc/prlayout.hxx') diff --git a/sd/inc/prlayout.hxx b/sd/inc/prlayout.hxx index 87bce53b1c8c..be02ec67e3c3 100644 --- a/sd/inc/prlayout.hxx +++ b/sd/inc/prlayout.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,4 @@ enum PresentationObjects #endif // _SD_PRLAYOUT_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit