summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-04-10 15:49:41 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-04-10 15:49:41 +0000
commitcf305b359d259935fd6e03cecb67fc200b1e0d90 (patch)
treefc4cd69c2efa511d9bf85d0158f631c3580ae8ad /package
parentae1f7fed150cf2a6ec9e152993d23be06f06d8f3 (diff)
INTEGRATION: CWS changefileheader (1.29.56); FILE MERGED
2008/04/01 15:22:25 thb 1.29.56.3: #i85898# Stripping all external header guards 2008/04/01 12:32:15 thb 1.29.56.2: #i85898# Stripping all external header guards 2008/03/31 16:19:10 rt 1.29.56.1: #i87441# Change license header to LPGL v3.
Diffstat (limited to 'package')
-rw-r--r--package/source/zippackage/ZipPackageEntry.cxx54
1 files changed, 18 insertions, 36 deletions
diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx
index c26febb512d4..82c4db3875ee 100644
--- a/package/source/zippackage/ZipPackageEntry.cxx
+++ b/package/source/zippackage/ZipPackageEntry.cxx
@@ -1,67 +1,49 @@
/*************************************************************************
*
- * OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * $RCSfile: ZipPackageEntry.cxx,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
*
- * $Revision: 1.29 $
+ * OpenOffice.org - a multi-platform office productivity suite
*
- * last change: $Author: obo $ $Date: 2006-09-17 17:29:10 $
+ * $RCSfile: ZipPackageEntry.cxx,v $
+ * $Revision: 1.30 $
*
- * 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.
*
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_package.hxx"
-#ifndef _ZIP_PACKAGE_ENTRY_HXX
#include <ZipPackageEntry.hxx>
-#endif
#ifndef _COM_SUN_STAR_PACKAGE_ZIP_ZIPCONSTANTS_HPP_
#include <com/sun/star/packages/zip/ZipConstants.hpp>
#endif
-#ifndef _VOS_DIAGNOSE_H_
#include <vos/diagnose.hxx>
-#endif
#if defined( OSL_DEBUG )
#if OSL_DEBUG > 0
-#ifndef _IMPL_VALID_CHARACTERS_HXX_
#include <ImplValidCharacters.hxx>
#endif
#endif
-#endif
-
-#ifndef _ZIP_PACKAGE_FOLDER_HXX
#include <ZipPackageFolder.hxx>
-#endif
-#ifndef _ZIP_PACKAGE_STREAM_HXX
#include <ZipPackageStream.hxx>
-#endif
-#ifndef _CONTENT_INFO_HXX_
#include <ContentInfo.hxx>
-#endif
#if defined( OSL_DEBUG_LEVEL )
#if OSL_DEBUG_LEVEL > 0