From 88650953bb5a9854065456f0527dea4c5f256049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Thu, 10 Apr 2008 13:23:31 +0000 Subject: [PATCH] INTEGRATION: CWS changefileheader (1.5.44); FILE MERGED 2008/04/01 15:42:44 thb 1.5.44.3: #i85898# Stripping all external header guards 2008/04/01 12:41:55 thb 1.5.44.2: #i85898# Stripping all external header guards 2008/03/31 15:27:47 rt 1.5.44.1: #i87441# Change license header to LPGL v3. --- store/source/storpage.hxx | 53 +++++++++++++----------------------- store/source/stortree.hxx | 56 +++++++++++++-------------------------- 2 files changed, 38 insertions(+), 71 deletions(-) diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx index 3499af144129..3c441058c1ae 100644 --- a/store/source/storpage.hxx +++ b/store/source/storpage.hxx @@ -1,55 +1,40 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: storpage.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.5 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2006-06-20 00:34:18 $ + * $RCSfile: storpage.hxx,v $ + * $Revision: 1.6 $ * - * 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. * ************************************************************************/ #ifndef _STORE_STORPAGE_HXX_ -#define _STORE_STORPAGE_HXX_ "$Revision: 1.5 $" +#define _STORE_STORPAGE_HXX_ "$Revision: 1.6 $" -#ifndef _SAL_TYPES_H_ #include -#endif - -#ifndef _STORE_OBJECT_HXX_ #include -#endif -#ifndef _STORE_LOCKBYTE_HXX_ #include -#endif - -#ifndef _STORE_STORBASE_HXX_ #include -#endif namespace store { diff --git a/store/source/stortree.hxx b/store/source/stortree.hxx index 3f29646291ce..c33c1e6ca776 100644 --- a/store/source/stortree.hxx +++ b/store/source/stortree.hxx @@ -1,59 +1,41 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: stortree.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.5 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2006-06-20 00:34:40 $ + * $RCSfile: stortree.hxx,v $ + * $Revision: 1.6 $ * - * 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. * ************************************************************************/ #ifndef _STORE_STORTREE_HXX -#define _STORE_STORTREE_HXX "$Revision: 1.5 $" +#define _STORE_STORTREE_HXX "$Revision: 1.6 $" -#ifndef _SAL_TYPES_H_ #include -#endif - -#ifndef _RTL_MEMORY_H_ #include -#endif - -#ifndef _OSL_ENDIAN_H_ #include -#endif -#ifndef _OSL_MUTEX_HXX_ #include -#endif - -#ifndef _STORE_TYPES_H_ #include -#endif #ifndef _STORE_STORBASE_HXX #include