From 7e4ebb6bc61a45af1845070a88f0efd0c15babbb Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 11 Apr 2008 11:50:34 +0000 Subject: INTEGRATION: CWS changefileheader (1.4.38); FILE MERGED 2008/04/01 16:06:07 thb 1.4.38.2: #i85898# Stripping all external header guards 2008/03/31 07:26:55 rt 1.4.38.1: #i87441# Change license header to LPGL v3. --- vos/inc/vos/conditn.hxx | 45 ++++++++++++++++++--------------------------- vos/inc/vos/connectn.hxx | 46 ++++++++++++++++++---------------------------- vos/inc/vos/istream.hxx | 46 ++++++++++++++++++---------------------------- vos/inc/vos/macros.hxx | 43 ++++++++++++++++++------------------------- vos/inc/vos/mutex.hxx | 47 ++++++++++++++++++----------------------------- 5 files changed, 90 insertions(+), 137 deletions(-) (limited to 'vos') diff --git a/vos/inc/vos/conditn.hxx b/vos/inc/vos/conditn.hxx index 75fca720b9d2..66bc0e832e9d 100644 --- a/vos/inc/vos/conditn.hxx +++ b/vos/inc/vos/conditn.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: conditn.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.4 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: vg $ $Date: 2006-06-02 12:35:55 $ + * $RCSfile: conditn.hxx,v $ + * $Revision: 1.5 $ * - * 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. * ************************************************************************/ @@ -40,12 +35,8 @@ #ifndef _OSL_CONDITN_H_ # include #endif -#ifndef _OSL_TIME_H_ #include -#endif -#ifndef _VOS_OBJECT_HXX_ # include -#endif namespace vos { diff --git a/vos/inc/vos/connectn.hxx b/vos/inc/vos/connectn.hxx index 01cbf964b433..9aa5c2bef1c1 100644 --- a/vos/inc/vos/connectn.hxx +++ b/vos/inc/vos/connectn.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: connectn.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.4 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: vg $ $Date: 2006-06-02 12:36:09 $ + * $RCSfile: connectn.hxx,v $ + * $Revision: 1.5 $ * - * 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. * ************************************************************************/ @@ -37,13 +32,8 @@ #ifndef _VOS_CONNECTN_HXX_ #define _VOS_CONNECTN_HXX_ -#ifndef _VOS_REF_HXX_ # include -#endif - -#ifndef _RTL_USTRING_HXX_ # include -#endif namespace vos { diff --git a/vos/inc/vos/istream.hxx b/vos/inc/vos/istream.hxx index ddeac15e8fd0..3eaf5c64bd7e 100644 --- a/vos/inc/vos/istream.hxx +++ b/vos/inc/vos/istream.hxx @@ -1,48 +1,38 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: istream.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.4 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2006-06-20 04:05:18 $ + * $RCSfile: istream.hxx,v $ + * $Revision: 1.5 $ * - * 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 _VOS_ISTREAM_HXX_ #define _VOS_ISTREAM_HXX_ -#ifndef _SAL_TYPES_H_ #include "sal/types.h" -#endif - -#ifndef _VOS_TYPES_HXX_ # include -#endif namespace vos { diff --git a/vos/inc/vos/macros.hxx b/vos/inc/vos/macros.hxx index 3f08f9759fed..0635bfa41a85 100644 --- a/vos/inc/vos/macros.hxx +++ b/vos/inc/vos/macros.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: macros.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.4 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: vg $ $Date: 2006-06-02 12:36:54 $ + * $RCSfile: macros.hxx,v $ + * $Revision: 1.5 $ * - * 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. * ************************************************************************/ @@ -38,9 +33,7 @@ #define _VOS_MACROS_HXX_ -#ifndef _OSL_ENDIAN_H_ #include -#endif // ********************************************************************* // Macro definitions diff --git a/vos/inc/vos/mutex.hxx b/vos/inc/vos/mutex.hxx index 91eb0a5a052c..e6f7d53af1cb 100644 --- a/vos/inc/vos/mutex.hxx +++ b/vos/inc/vos/mutex.hxx @@ -1,50 +1,39 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: mutex.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.4 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: vg $ $Date: 2006-06-02 12:37:23 $ + * $RCSfile: mutex.hxx,v $ + * $Revision: 1.5 $ * - * 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 _VOS_MUTEX_HXX_ #define _VOS_MUTEX_HXX_ -#ifndef _VOS_TYPES_HXX_ # include -#endif -#ifndef _VOS_OBJECT_HXX_ # include -#endif -#ifndef _OSL_MUTEX_H_ # include -#endif namespace vos { -- cgit