Author: maxcom
Date: Wed Nov 17 08:13:40 2010
New Revision: 1035947
URL: http://svn.apache.org/viewvc?rev=1035947&view=rev
Log:
dispose xml cursor when iteration over it is done (more)
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingParagraph.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingParagraph.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingParagraph.java?rev=1035947&r1=1035946&r2=1035947&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingParagraph.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingParagraph.java
Wed Nov 17 08:13:40 2010
@@ -44,6 +44,8 @@ public class DrawingParagraph {
text.append('\n');
}
}
+
+ c.dispose();
return text;
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java?rev=1035947&r1=1035946&r2=1035947&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java
Wed Nov 17 08:13:40 2010
@@ -69,6 +69,8 @@ public class XSLFCommonSlideData {
}
}
}
+
+ c.dispose();
}
return out;
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java?rev=1035947&r1=1035946&r2=1035947&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
Wed Nov 17 08:13:40 2010
@@ -1098,6 +1098,7 @@ public class XWPFDocument extends POIXML
CTRow row = (CTRow)o;
cursor.toParent();
o = cursor.getObject();
+ cursor.dispose();
if(! (o instanceof CTTbl)){
return null;
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java?rev=1035947&r1=1035946&r2=1035947&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java Wed
Nov 17 08:13:40 2010
@@ -66,6 +66,7 @@ public class XWPFFooter extends XWPFHead
bodyElements.add(t);
}
}
+ cursor.dispose();
getAllPictures();
}
@@ -125,6 +126,7 @@ public class XWPFFooter extends XWPFHead
bodyElements.add(t);
}
}
+ cursor.dispose();
getAllPictures();
} catch (IOException e) {
// TODO Auto-generated catch block
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java?rev=1035947&r1=1035946&r2=1035947&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java Wed
Nov 17 08:13:40 2010
@@ -67,6 +67,7 @@ public class XWPFHeader extends XWPFHead
tables.add(t);
}
}
+ cursor.dispose();
getAllPictures();
}
@@ -131,6 +132,7 @@ public class XWPFHeader extends XWPFHead
bodyElements.add(t);
}
}
+ cursor.dispose();
getAllPictures();
} catch (IOException e) {
// TODO Auto-generated catch block
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java?rev=1035947&r1=1035946&r2=1035947&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
Wed Nov 17 08:13:40 2010
@@ -504,6 +504,7 @@ public abstract class XWPFHeaderFooter e
bodyElements.add(t);
}
}
+ cursor.dispose();
getAllPictures();
}
@@ -521,6 +522,7 @@ public abstract class XWPFHeaderFooter e
CTRow row = (CTRow)o;
cursor.toParent();
o = cursor.getObject();
+ cursor.dispose();
if(! (o instanceof CTTbl)){
return null;
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java?rev=1035947&r1=1035946&r2=1035947&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
Wed Nov 17 08:13:40 2010
@@ -107,6 +107,8 @@ public class XWPFParagraph implements IB
}
}
}
+
+ c.dispose();
// Look for bits associated with the runs
for(XWPFRun run : runs) {
@@ -1159,6 +1161,8 @@ public class XWPFParagraph implements IB
else
candCharPos=0;
}
+
+ c.dispose();
}
return null;
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java?rev=1035947&r1=1035946&r2=1035947&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java Wed Nov
17 08:13:40 2010
@@ -628,6 +628,8 @@ public class XWPFRun {
}
}
}
+
+ c.dispose();
// Any picture text?
if(pictureText != null && pictureText.length() > 0) {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java?rev=1035947&r1=1035946&r2=1035947&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
Wed Nov 17 08:13:40 2010
@@ -65,6 +65,7 @@ public class XWPFTableCell implements IB
bodyElements.add(t);
}
}
+ cursor.dispose();
}
@@ -336,6 +337,7 @@ public class XWPFTableCell implements IB
CTRow row = (CTRow)o;
cursor.toParent();
o = cursor.getObject();
+ cursor.dispose();
if(! (o instanceof CTTbl)){
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
