From 16c87e80247e5c8c1c51f1644d7219252ec74d2b Mon Sep 17 00:00:00 2001 From: Kieren Eaton Date: Wed, 7 Aug 2013 10:58:11 +0800 Subject: [PATCH 1/2] added a check so picture Ids only get processed if they contain spaces --- src/com/versusoft/packages/jodl/OdtUtils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/versusoft/packages/jodl/OdtUtils.java b/src/com/versusoft/packages/jodl/OdtUtils.java index 38aef83..72a2208 100755 --- a/src/com/versusoft/packages/jodl/OdtUtils.java +++ b/src/com/versusoft/packages/jodl/OdtUtils.java @@ -595,6 +595,7 @@ private static void normalizePictureIds(Node root){ Node picIdNode = node.getAttributes().getNamedItem("draw:name"); if(picIdNode != null) { String picId = picIdNode.getNodeValue(); + if(!picId.contains(" ")) return; picId = picId.trim().replace(" ", "_"); logger.info("Normalized picture id from '"+picIdNode.getNodeValue()+"' to '"+picId+"'"); picIdNode.setTextContent(picId); From edf193f2593c7bc299d7fb42a2e7cb6688253f66 Mon Sep 17 00:00:00 2001 From: Kieren Eaton Date: Mon, 19 Aug 2013 07:45:31 +0800 Subject: [PATCH 2/2] Fixed premature exit of for loop for picture ids Refactored picture Id replacement logic --- src/com/versusoft/packages/jodl/OdtUtils.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/versusoft/packages/jodl/OdtUtils.java b/src/com/versusoft/packages/jodl/OdtUtils.java index 72a2208..a0babaa 100755 --- a/src/com/versusoft/packages/jodl/OdtUtils.java +++ b/src/com/versusoft/packages/jodl/OdtUtils.java @@ -595,10 +595,11 @@ private static void normalizePictureIds(Node root){ Node picIdNode = node.getAttributes().getNamedItem("draw:name"); if(picIdNode != null) { String picId = picIdNode.getNodeValue(); - if(!picId.contains(" ")) return; - picId = picId.trim().replace(" ", "_"); - logger.info("Normalized picture id from '"+picIdNode.getNodeValue()+"' to '"+picId+"'"); - picIdNode.setTextContent(picId); + String newId = picId.trim().replace(" ", "_"); + if(!picId.equals(newId)) { + logger.info("Normalized picture id from '"+picId+"' to '"+newId+"'"); + picIdNode.setTextContent(newId); + } } } }