summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-04-10 17:32:37 +0000
committerRüdiger Timm <rt@openoffice.org>2008-04-10 17:32:37 +0000
commite292158b220320e98baf9b089ba2eb9482ad214a (patch)
tree3a3012835aae6bddf0de28fefba8a03c52b24560 /avmedia
parent57446ac4fc4e435c93a94f1866bd3bb0adff0517 (diff)
INTEGRATION: CWS changefileheader (1.4.86); FILE MERGED
2008/04/01 15:00:19 thb 1.4.86.2: #i85898# Stripping all external header guards 2008/03/28 16:04:01 rt 1.4.86.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/xine/xinecommon.hxx59
1 files changed, 18 insertions, 41 deletions
diff --git a/avmedia/source/xine/xinecommon.hxx b/avmedia/source/xine/xinecommon.hxx
index 7a010f5c8e14..36abcca1786c 100644
--- a/avmedia/source/xine/xinecommon.hxx
+++ b/avmedia/source/xine/xinecommon.hxx
@@ -1,71 +1,48 @@
/*************************************************************************
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * $RCSfile: xinecommon.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-19 14:00:21 $
+ * $RCSfile: xinecommon.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
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef _XINECOMMON_HXX
#define _XINECOMMON_HXX
-#ifndef _OSL_MUTEX_HXX_
#include <osl/mutex.hxx>
-#endif
#ifndef __RTL_USTRING_
#include <rtl/ustring.hxx>
#endif
-#ifndef _DEBUG_HXX
#include <tools/debug.hxx>
-#endif
-#ifndef _STREAM_HXX
#include <tools/stream.hxx>
-#endif
-#ifndef _STRING_HXX
#include <tools/string.hxx>
-#endif
-#ifndef _URLOBJ_HXX
#include <tools/urlobj.hxx>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE1_HXX_
#include <cppuhelper/implbase1.hxx>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE2_HXX_
#include <cppuhelper/implbase2.hxx>
-#endif
-#ifndef _CPPUHELPER_WEAK_HXX_
#include <cppuhelper/weak.hxx>
-#endif
-#ifndef _CPPUHELPER_FACTORY_HXX_
#include <cppuhelper/factory.hxx>
-#endif
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/RuntimeException.hpp>