diff options
| -rw-r--r-- | src/java/org/apache/fop/render/rtf/BorderAttributesConverter.java | 12 | ||||
| -rw-r--r-- | status.xml | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/java/org/apache/fop/render/rtf/BorderAttributesConverter.java b/src/java/org/apache/fop/render/rtf/BorderAttributesConverter.java index 54119c09f..43adc449f 100644 --- a/src/java/org/apache/fop/render/rtf/BorderAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/BorderAttributesConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. + * Copyright 1999-2006 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -101,6 +101,14 @@ public class BorderAttributesConverter { return IBorderAttributes.BORDER_DOTTED; } else if (iBorderStyle == Constants.EN_DASHED) { return IBorderAttributes.BORDER_DASH; + } else if (iBorderStyle == Constants.EN_GROOVE) { + return IBorderAttributes.BORDER_ENGRAVE; + } else if (iBorderStyle == Constants.EN_RIDGE) { + return IBorderAttributes.BORDER_EMBOSS; + } else if (iBorderStyle == Constants.EN_INSET) { + return IBorderAttributes.BORDER_ENGRAVE; + } else if (iBorderStyle == Constants.EN_OUTSET) { + return IBorderAttributes.BORDER_EMBOSS; /* } else if (iBorderStyle==Constants value.equals("hairline")) { return IBorderAttributes.BORDER_HAIRLINE;*/ /* } else if (iBorderStyle==Constant value.equals("dot-dash")) { @@ -120,7 +128,7 @@ public class BorderAttributesConverter { } else if (iBorderStyle==Constant value.equals("engrave")) { return IBorderAttributes.BORDER_ENGRAVE;*/ } else { - return null; + return IBorderAttributes.BORDER_SINGLE_THICKNESS; } } diff --git a/status.xml b/status.xml index 403c91bc2..a0a333cb0 100644 --- a/status.xml +++ b/status.xml @@ -27,6 +27,9 @@ <changes> <release version="FOP Trunk"> + <action context="Code" dev="JM" type="fix" fixes-bug="38132"> + Bugfix: Certain border styles could lead to a NullPointerException. + </action> <action context="Code" dev="JM" type="fix" fixes-bug="38102"> Bugfix: Space was not adjusted if the space was on a nested block. This could lead to content overflowing the bottom of a page. |