diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 10:22:28 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-11 10:22:28 +0000 |
commit | 71bbb692a98a0ab3af036df67defd3dc69e5d336 (patch) | |
tree | c5875ec79e9e25502567e2334986ed4b6cc7a968 /salhelper/inc | |
parent | INTEGRATION: CWS changefileheader (1.2.170); FILE MERGED (diff) | |
download | core-71bbb692a98a0ab3af036df67defd3dc69e5d336.tar.gz core-71bbb692a98a0ab3af036df67defd3dc69e5d336.zip |
INTEGRATION: CWS changefileheader (1.2.62); FILE MERGED
2008/04/01 15:25:17 thb 1.2.62.3: #i85898# Stripping all external header guards
2008/04/01 12:34:28 thb 1.2.62.2: #i85898# Stripping all external header guards
2008/03/31 07:25:46 rt 1.2.62.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'salhelper/inc')
-rw-r--r-- | salhelper/inc/salhelper/future.hxx | 51 | ||||
-rw-r--r-- | salhelper/inc/salhelper/futurequeue.hxx | 53 |
2 files changed, 36 insertions, 68 deletions
diff --git a/salhelper/inc/salhelper/future.hxx b/salhelper/inc/salhelper/future.hxx index 2cf32d603ccc..e24184a5d3b7 100644 --- a/salhelper/inc/salhelper/future.hxx +++ b/salhelper/inc/salhelper/future.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: future.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2005-09-08 16:58:17 $ + * $RCSfile: future.hxx,v $ + * $Revision: 1.3 $ * - * 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 + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. * ************************************************************************/ #ifndef _SALHELPER_FUTURE_HXX_ #define _SALHELPER_FUTURE_HXX_ -#ifndef _SAL_TYPES_H_ #include <sal/types.h> -#endif - -#ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> -#endif -#ifndef _OSL_CONDITN_HXX_ #include <osl/conditn.hxx> -#endif - -#ifndef _SALHELPER_REFOBJ_HXX_ #include <salhelper/refobj.hxx> -#endif namespace salhelper { diff --git a/salhelper/inc/salhelper/futurequeue.hxx b/salhelper/inc/salhelper/futurequeue.hxx index c84edea4505d..1f7b7f4c1f73 100644 --- a/salhelper/inc/salhelper/futurequeue.hxx +++ b/salhelper/inc/salhelper/futurequeue.hxx @@ -1,58 +1,41 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: futurequeue.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.2 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: rt $ $Date: 2005-09-08 16:58:33 $ + * $RCSfile: futurequeue.hxx,v $ + * $Revision: 1.3 $ * - * 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 + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. * ************************************************************************/ #ifndef _SALHELPER_FUTUREQUEUE_HXX_ #define _SALHELPER_FUTUREQUEUE_HXX_ -#ifndef _SAL_TYPES_H_ #include <sal/types.h> -#endif - -#ifndef _RTL_REF_HXX_ #include <rtl/ref.hxx> -#endif -#ifndef _OSL_MUTEX_HXX_ #include <osl/mutex.hxx> -#endif - -#ifndef _SALHELPER_FUTURE_HXX_ #include <salhelper/future.hxx> -#endif -#ifndef _SALHELPER_QUEUE_HXX_ #include <salhelper/queue.hxx> -#endif namespace salhelper { |