From 8edc2b41849bf176e1c680bb4d041f639d37a232 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Thu, 10 Apr 2008 14:20:50 +0000
Subject: INTEGRATION: CWS changefileheader (1.5.118); FILE MERGED 2008/04/01
 16:02:21 thb 1.5.118.3: #i85898# Stripping all external header guards
 2008/04/01 12:58:20 thb 1.5.118.2: #i85898# Stripping all external header
 guards 2008/03/31 15:30:26 rt 1.5.118.1: #i87441# Change license header to
 LPGL v3.

---
 ucb/source/ucp/odma/odma_lib.cxx | 49 ++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 30 deletions(-)

(limited to 'ucb/source')

diff --git a/ucb/source/ucp/odma/odma_lib.cxx b/ucb/source/ucp/odma/odma_lib.cxx
index 921a389eb5..e837c51ad6 100644
--- a/ucb/source/ucp/odma/odma_lib.cxx
+++ b/ucb/source/ucp/odma/odma_lib.cxx
@@ -1,35 +1,30 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
- *  $RCSfile: odma_lib.cxx,v $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  $Revision: 1.5 $
+ * $RCSfile: odma_lib.cxx,v $
+ * $Revision: 1.6 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 13:58:10 $
+ * This file is part of OpenOffice.org.
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * 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.
  *
+ * 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).
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 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
+ * 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.
  *
  ************************************************************************/
 
@@ -38,15 +33,9 @@
 //#ifndef _OSL_PROCESS_H_ 
 //#include <osl/process.h>
 //#endif
-#ifndef _OSL_MODULE_H_
 #include <osl/module.h>
-#endif
-#ifndef _RTL_USTRING_HXX_ 
 #include <rtl/ustring.hxx>
-#endif
-#ifndef ODMA_LIB_HXX
 #include "odma_lib.hxx"
-#endif
 
 
 namespace odma
-- 
cgit v1.2.3