From: Nick Burch <nick@apache.org>
Date: Tue, 25 Oct 2016 10:21:16 +0000 (+0000)
Subject: v5 text extraction
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3e01fe6f682e8ba839216ca87d39ff6870881d27;p=poi.git

v5 text extraction

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1766497 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV5.java b/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV5.java
index 728d28a3bf..6873d75995 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV5.java
+++ b/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV5.java
@@ -29,10 +29,13 @@ public final class PointerV5 extends Pointer {
     }
     public boolean destinationHasPointers() {
         if(type == 20) return true;
+        if(type == 22) return false;
         if(format == 0x1d || format == 0x1e) return true;
         return (0x50 <= format && format < 0x60);
     }
     public boolean destinationHasChunks() {
+        if (type == 21) return true;
+        if (type == 24) return true;
         return (0xd0 <= format && format < 0xdf);
     }
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java b/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java
index fde1479c75..bad6a60f5c 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java
+++ b/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java
@@ -92,10 +92,7 @@ public final class TestHDGFCore extends TestCase {
       assertNotNull(hdgf);
 	}
 
-	/**
-	 * TODO: V5 support is incomplete
-	 */
-    public void TODOtestV5() throws Exception {
+    public void testV5() throws Exception {
         fs = new POIFSFileSystem(_dgTests.openResourceAsStream("v5_Connection_Types.vsd"));
 
         HDGFDiagram hdgf = new HDGFDiagram(fs);
@@ -104,7 +101,7 @@ public final class TestHDGFCore extends TestCase {
         VisioTextExtractor textExtractor = new VisioTextExtractor(hdgf);
         String text = textExtractor.getText().replace("\u0000", "").trim();
 
-        assertEquals("Static to Static\n\nDynamic to Dynamic\n\nDynamic to Static", text);
+        assertEquals("Static to Static\nDynamic to Static\nDynamic to Dynamic", text);
     }
 
     public void testV6NonUtf16LE() throws Exception {