summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-04-10 15:48:40 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-04-10 15:48:40 +0000
commit656460362a95aa2d574ceadc7cd51908fbd7eb7c (patch)
treebf2d2784d9ed8652dfe7552c86340d268bf7a8c2
parent36fce2c388c8bba0ad7f40d3a51a9dde7c1bc355 (diff)
INTEGRATION: CWS changefileheader (1.8.66); FILE MERGED
2008/04/01 12:32:14 thb 1.8.66.2: #i85898# Stripping all external header guards 2008/03/31 16:19:09 rt 1.8.66.1: #i87441# Change license header to LPGL v3.
-rw-r--r--package/source/zippackage/ContentInfo.hxx47
1 files changed, 18 insertions, 29 deletions
diff --git a/package/source/zippackage/ContentInfo.hxx b/package/source/zippackage/ContentInfo.hxx
index 750b7ca7cfb6..7a0efe5ba1fe 100644
--- a/package/source/zippackage/ContentInfo.hxx
+++ b/package/source/zippackage/ContentInfo.hxx
@@ -1,52 +1,41 @@
/*************************************************************************
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * $RCSfile: ContentInfo.hxx,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
*
- * $Revision: 1.8 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * last change: $Author: hr $ $Date: 2006-06-20 06:14:03 $
+ * $RCSfile: ContentInfo.hxx,v $
+ * $Revision: 1.9 $
*
- * 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 _CONTENT_INFO_HXX_
#define _CONTENT_INFO_HXX_
-#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
#include <com/sun/star/container/XNameContainer.hpp>
-#endif
#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEl_HPP_
#include <com/sun/star/lang/XUnoTunnel.hpp>
#endif
-#ifndef _ZIP_PACKAGE_FOLDER_HXX
#include <ZipPackageFolder.hxx>
-#endif
-#ifndef _ZIP_PACKAGE_STREAM_HXX
#include <ZipPackageStream.hxx>
-#endif
namespace com { namespace sun { namespace star { namespace packages {
class ContentInfo : public cppu::OWeakObject