wip #5195 @0.5

diff --git a/.idea/php.xml b/.idea/php.xml
index 8ccad25c1da7d35f201e99da78ae25d1a240a3d0..241dbb92cfe5cad4b815b7043b3acb9dc129fd99 100644 (file)
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -65,5 +65,7 @@
       <path value="$PROJECT_DIR$/vendor/cubist/net" />
     </include_path>
   </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="7.3" />
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.0">
+    <option name="suggestChangeDefaultLanguageLevel" value="false" />
+  </component>
 </project>
\ No newline at end of file

diff --git a/resources/tools/fwstk/.idea/workspace.xml b/resources/tools/fwstk/.idea/workspace.xml
index 98b622527909c3fd1b9102bb464f97941628094d..082ba1c19c9affc57dc763b25ecde038221ce063 100644 (file)
--- a/resources/tools/fwstk/.idea/workspace.xml
+++ b/resources/tools/fwstk/.idea/workspace.xml
@@ -491,7 +491,7 @@
       <workItem from="1595346736329" duration="5317000" />
       <workItem from="1606322492928" duration="1489000" />
       <workItem from="1631721143268" duration="984000" />
-      <workItem from="1648579261372" duration="1816000" />
+      <workItem from="1648579261372" duration="2928000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>

diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/Main.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/Main.class
index 53201112b2cace63a354a2ddfb0b93281d45df75..446c643c4360b1398fb10f66b6917c3609b22ace 100644 (file)
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/Main.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/Main.class differ

diff --git a/resources/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar b/resources/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar
index d2c1e4548ca7e8c8413e6e3555d713f131514439..757f7c1d2ebda94c14f83c24638ff64f7d2780ff 100644 (file)
Binary files a/resources/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar and b/resources/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar differ

diff --git a/resources/tools/fwstk/src/com/fluidbook/fwstk/Main.java b/resources/tools/fwstk/src/com/fluidbook/fwstk/Main.java
index 6ebf8a4ab23945848d7d594c6a8bf84c3fc0f2fb..760366a914e812b25ea164b739895288221932be 100644 (file)
--- a/resources/tools/fwstk/src/com/fluidbook/fwstk/Main.java
+++ b/resources/tools/fwstk/src/com/fluidbook/fwstk/Main.java
@@ -22,6 +22,7 @@ import org.apache.pdfbox.pdmodel.common.PDPageLabels;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.interactive.action.type.PDAction;
 import org.apache.pdfbox.pdmodel.interactive.action.type.PDActionGoTo;
+import org.apache.pdfbox.pdmodel.interactive.action.type.PDActionRemoteGoTo;
 import org.apache.pdfbox.pdmodel.interactive.action.type.PDActionURI;
 import org.apache.pdfbox.pdmodel.interactive.annotation.*;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.destination.PDDestination;
@@ -401,6 +402,7 @@ public class Main {
         PDOutlineItem current = bookmark.getFirstChild();
         while (current != null) {
             try {
+
                 res.add("BookmarkTitle:\t\t" + StringEscapeUtils.escapeHtml4(current.getTitle()));
                 res.add("BookmarkLevel:\t\t" + level);
                 res.add("BookmarkPage:\t\t"
@@ -690,6 +692,9 @@ public class Main {
     }
 
     public static String getPageFromAction(PDDocument doc, PDAction a) throws IOException {
+        if(a instanceof PDActionRemoteGoTo){
+            return "-1";
+        }
         PDActionGoTo aa = (PDActionGoTo) a;
         if (null == a) {
             return "-1";