Bug 51424 - Ignore exceptions in ParagraphSprmUncompressor

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

diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 614b001f25663a1c80c063a64c5c8140d37bba16..31ad081831037919a95fa3dca651475d38544e32 100644 (file)
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -34,6 +34,7 @@
 
     <changes>
         <release version="3.8-beta4" date="2011-??-??">
+           <action dev="poi-developers" type="add">51424 - Ignore exceptions in ParagraphSprmUncompressor</action>
            <action dev="poi-developers" type="fix">51415 - Fixed Workbook.createSheet(sheetName) to truncate names longer than 31 characters</action>
            <action dev="poi-developers" type="fix">51332 - Fixed internal IDs of shapes generated by HSSFPatriarch when there are more than 1023 drawing objects </action>
            <action dev="poi-developers" type="fix">48408 - Improved documentation for Sheet.setColumnWidth </action>

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
index 9268183702970966b9a53f9cc504da92ff3ab28f..59fba883bafa9995674b008cd91f94c5e5682417 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
@@ -24,6 +24,8 @@ import org.apache.poi.hwpf.usermodel.LineSpacingDescriptor;
 import org.apache.poi.hwpf.usermodel.ShadingDescriptor;
 import org.apache.poi.hwpf.usermodel.DropCapSpecifier;
 import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.POILogFactory;
+import org.apache.poi.util.POILogger;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -33,6 +35,9 @@ import java.util.ArrayList;
 public final class ParagraphSprmUncompressor
   extends SprmUncompressor
 {
+    private static final POILogger logger = POILogFactory
+            .getLogger( ParagraphSprmUncompressor.class );
+
   public ParagraphSprmUncompressor()
   {
   }
@@ -60,7 +65,17 @@ public final class ParagraphSprmUncompressor
       // table row
       if (sprm.getType() == SprmOperation.PAP_TYPE)
       {
-        unCompressPAPOperation(newProperties, sprm);
+          try
+          {
+              unCompressPAPOperation( newProperties, sprm );
+          }
+          catch ( Exception exc )
+          {
+              logger.log(
+                      POILogger.ERROR,
+                      "Unable to apply SPRM operation '"
+                              + sprm.getOperation() + "': ", exc );
+          }
       }
     }