INTEGRATION: CWS changefileheader (1.3.38); FILE MERGED

2008/04/01 16:06:08 thb 1.3.38.2: #i85898# Stripping all external header guards
2008/03/31 07:26:56 rt 1.3.38.1: #i87441# Change license header to LPGL v3.
This commit is contained in:
Rüdiger Timm 2008-04-11 11:56:24 +00:00
parent 5c69a5a7d2
commit 0093471cdf
2 changed files with 36 additions and 58 deletions

View file

@ -1,50 +1,39 @@
/*************************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* $RCSfile: stream.hxx,v $
* Copyright 2008 by Sun Microsystems, Inc.
*
* $Revision: 1.3 $
* OpenOffice.org - a multi-platform office productivity suite
*
* last change: $Author: vg $ $Date: 2006-06-02 12:40:21 $
* $RCSfile: stream.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
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef _VOS_STREAM_HXX_
#define _VOS_STREAM_HXX_
#ifndef _VOS_TYPES_HXX_
# include <vos/types.hxx>
#endif
#ifndef _VOS_OBJECT_HXX_
# include <vos/object.hxx>
#endif
#ifndef _VOS_ISTREAM_HXX_
# include <vos/istream.hxx>
#endif
namespace vos
{

View file

@ -1,35 +1,30 @@
/*************************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* $RCSfile: timer.hxx,v $
* Copyright 2008 by Sun Microsystems, Inc.
*
* $Revision: 1.3 $
* OpenOffice.org - a multi-platform office productivity suite
*
* last change: $Author: vg $ $Date: 2006-06-02 12:40:52 $
* $RCSfile: timer.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
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
@ -37,15 +32,9 @@
#ifndef _VOS_TIMER_HXX_
#define _VOS_TIMER_HXX_
#ifndef _VOS_REFERNCE_HXX_
# include <vos/refernce.hxx>
#endif
#ifndef _VOS_MUTEX_HXX_
# include <vos/mutex.hxx>
#endif
#ifndef _OSL_TIME_H_
# include <osl/time.h>
#endif
namespace vos