fixed an npe

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

diff --git a/src/org/apache/fop/fo/FObj.java b/src/org/apache/fop/fo/FObj.java
index ad10bbc77dbcc205e0c1edd97453b5967e823fa2..02d30571986c71a809e38e3be34a25b61d6c6efc 100644 (file)
--- a/src/org/apache/fop/fo/FObj.java
+++ b/src/org/apache/fop/fo/FObj.java
@@ -149,7 +149,7 @@ public class FObj extends FONode {
      * reference areas and use the value of its writing-mode property.
      * If no such ancestor is found, use the value on the root FO.
      */
-    private void setWritingMode() {
+    protected void setWritingMode() {
         FObj p;
         FObj parent;
         for (p = this;

diff --git a/src/org/apache/fop/fo/UnknownXMLObj.java b/src/org/apache/fop/fo/UnknownXMLObj.java
index 5c734aaed6145bfa4a238c2cdb1597ff6e1dbb01..0110dd992e4a70d0fd31c24b4e5d1f92dc3d443f 100644 (file)
--- a/src/org/apache/fop/fo/UnknownXMLObj.java
+++ b/src/org/apache/fop/fo/UnknownXMLObj.java
@@ -62,7 +62,11 @@ public class UnknownXMLObj extends XMLObj {
     protected UnknownXMLObj(FObj parent, PropertyList propertyList, String space, String tag) {
         super(parent, propertyList, tag);
         this.namespace = space;
-        this.name = this.namespace + ":" + tag;
+                               if(!"".equals(space)) {
+            this.name = this.namespace + ":" + tag;
+        } else {
+            this.name = "(none):" + tag;
+        }
     }
 
     public String getNameSpace() {

diff --git a/src/org/apache/fop/fo/XMLObj.java b/src/org/apache/fop/fo/XMLObj.java
index 1b17bf21f360cadbbae87893d86fbeb07800e8ae..c7631efac12be845b4d9c92c7e6cc17910770305 100644 (file)
--- a/src/org/apache/fop/fo/XMLObj.java
+++ b/src/org/apache/fop/fo/XMLObj.java
@@ -168,5 +168,6 @@ public abstract class XMLObj extends FObj {
 
     public void rollback(Vector snapshot) {}
 
+    protected void setWritingMode() {}
 }