Author: maxcom
Date: Mon Mar 21 13:39:44 2011
New Revision: 1083780

URL: http://svn.apache.org/viewvc?rev=1083780&view=rev
Log:
XWPFPicture: support for reading picture description

Modified:
    poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java

Modified: 
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java?rev=1083780&r1=1083779&r2=1083780&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java 
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java Mon 
Mar 21 13:39:44 2011
@@ -31,15 +31,17 @@ public class XWPFPicture {
        
        protected XWPFParagraph paragraph;
        private CTPicture ctPic;
-        
-        public XWPFParagraph getParagraph(){
+    private String description;
+
+    public XWPFParagraph getParagraph(){
                 return paragraph;
         }
         
         public XWPFPicture(CTPicture ctPic, XWPFParagraph paragraph){
                 this.paragraph = paragraph;
                 this.ctPic = ctPic;
-        }
+         description = ctPic.getNvPicPr().getCNvPr().getDescr();
+     }
         
         /**
          * Link Picture with PictureData
@@ -71,5 +73,8 @@ public class XWPFPicture {
        }
        return null;
     }
-    
+
+    public String getDescription() {
+        return description;
+    }
 }

Modified: 
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java?rev=1083780&r1=1083779&r2=1083780&view=diff
==============================================================================
--- 
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java 
(original)
+++ 
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java 
Mon Mar 21 13:39:44 2011
@@ -343,6 +343,7 @@ public class TestXWPFRun extends TestCas
 
                 for (XWPFPicture pic : pictures) {
                     assertNotNull(pic.getPictureData());
+                    assertEquals("DOZOR", pic.getDescription());
                 }
 
                 count+= pictures.size();



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to