moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Resolve the licensing issue around chunks_parse_cmds.tbl, with the newly dual-licensed version

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@730438 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2008-12-31 18:20:37 +00:00
parent d9df585ca5
commit 4f047382c2
5 changed files with 59 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
legal/NOTICE
View File

@ -11,17 +11,6 @@ Common Public License Version 1.0:
See http://www.junit.org/
A single resource file of the POI scratchpad component HDGF is taken from
VSDump, and is under the GNU General Public Licence version 3 (GPL v3):
http://gplv3.fsf.org/
Since this is a data file, and has no compiled version (the original
file is distributed in both source and binary versions of POI), there should
be little difference in licencing requirements compared to the ASL.
For those wishing to avoid this component, the HDGF part of the POI
scratchpad should be omitted.
See http://www.gnome.ru/projects/vsdump_en.html
The Office Open XML support had additional dependencies, with their
own licensing:
* XML Beans - http://xmlbeans.apache.org/

1
src/documentation/content/xdocs/changes.xml
View File

@ -37,6 +37,7 @@
<!-- Don't forget to update status.xml too! -->
<release version="3.5-beta5" date="2008-??-??">
<action dev="POI-DEVELOPERS" type="fix">46361 - resolve licensing issues around the HDGF resource file, chunks_parse_cmds.tbl</action>
<action dev="POI-DEVELOPERS" type="add">46410 - added implementation for TIME() function</action>
<action dev="POI-DEVELOPERS" type="add">46320 - added HSSFPictureData.getFormat()</action>
<action dev="POI-DEVELOPERS" type="fix">46445 fixed HSSFSheet.shiftRow to move hyperlinks</action>

1
src/documentation/content/xdocs/status.xml
View File

@ -34,6 +34,7 @@
<!-- Don't forget to update changes.xml too! -->
<changes>
<release version="3.5-beta5" date="2008-??-??">
<action dev="POI-DEVELOPERS" type="fix">46361 - resolve licensing issues around the HDGF resource file, chunks_parse_cmds.tbl</action>
<action dev="POI-DEVELOPERS" type="add">46410 - added implementation for TIME() function</action>
<action dev="POI-DEVELOPERS" type="add">46320 - added HSSFPictureData.getFormat()</action>
<action dev="POI-DEVELOPERS" type="fix">46445 fixed HSSFSheet.shiftRow to move hyperlinks</action>

83
src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl
View File

@ -1,14 +1,41 @@
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 3 of the License.
#
# This program 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 General Public License for more details.
# vsdump: test program to dump and parse content of vsd file
#
#
# version 0.0.26
# Copyright (C) 2006-2007 Valek Filippov (frob@df.ru)
#
# This file is dual-licensed (GPLv3 and ASLv2).
#
# =======================================================================
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# =======================================================================
# This program is free software; you can redistribute it and/or
# modify it under the terms of version 3 or later of the GNU General Public
# License as published by the Free Software Foundation.
#
# This program 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
# USA
# =======================================================================
#
# version 0.0.45
#
# Need to extend with 'format' field for conversion length (inch->mm), angles(rad->degree) and enums (e.g.
# for aligns -- left/right/justify etc.
@ -39,6 +66,8 @@
# 21 - offset to start of blocks in version 11
# 28 - extension for image files [experimental]
# 29 - num of parts and type for OLE [experimental]
# 30 - 3 bytes RGB-color
# 31 - 9 bytes -- 1st is 'Unit', + 8 bytes IEEE-754 fraction
# Quick workaround for losing of 1st table
start 10
@ -56,7 +85,7 @@ end
start 14
10 0 Text
12 27 0
12 8 0
18 0 0
end
@ -180,7 +209,7 @@ start 100
end
start 101
10 0 Unknown 0x65
10 0 ShapeList
18 0 0
end
@ -195,17 +224,17 @@ start 103
end
start 104
10 0 Unknown 0x68
10 0 PropList
18 0 0
end
start 105
10 0 Unknown 0x69
10 0 CharList
18 0 0
end
start 106
10 0 Unknown 0x6a
10 0 ParaList
18 0 0
end
@ -215,7 +244,7 @@ start 107
end
start 108
10 0 Unknown 0x6c
10 0 GeomList
18 0 0
end
@ -240,7 +269,7 @@ start 112
end
start 113
10 0 Unknown 0x71
10 0 ConnectionList
18 0 0
end
@ -275,7 +304,7 @@ start 130
end
start 131
10 0 Unknown 0x83
10 0 ShapeID
18 0 0
end
@ -350,10 +379,10 @@ end
start 137
10 0 Geometry
0 20 NoFill
1 20 NoLine
2 20 NoShow
3 20 NoSnap
0 19 NoFill
1 19 NoLine
2 19 NoShow
3 19 NoSnap
21 22 BlocksStart
18 0 0
end
@ -871,9 +900,9 @@ start 192
end
start 193
10 0 Unknown 0xc1
9 20 Unknown1
9 29 Unknown2
10 0 PolylineTo
9 20 X
9 29 Y
18 0 0
end
@ -912,12 +941,12 @@ start 197
end
start 198
10 0 Unknown 0xc6
10 0 Annotation
18 0 0
end
start 199
10 0 Unknown 0xc7
10 0 SmartTagDef
18 0 0
end

2
src/scratchpad/testcases/org/apache/poi/hdgf/chunks/TestChunks.java
View File

@ -179,7 +179,7 @@ public static final byte[] data_b = new byte[] { 70, 0, 0, 0,
assertEquals(10, chunk.commandDefinitions[0].getType());
assertEquals(0, chunk.commandDefinitions[0].getOffset());
assertEquals("Unknown 0x68", chunk.commandDefinitions[0].getName());
assertEquals("PropList", chunk.commandDefinitions[0].getName());
assertEquals(18, chunk.commandDefinitions[1].getType());
assertEquals(0, chunk.commandDefinitions[1].getOffset());