You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ye...@apache.org on 2009/06/07 17:39:55 UTC

svn commit: r782402 [5/8] - in /poi/tags/REL_3_5_BETA6: ./ src/contrib/src/org/apache/poi/contrib/poibrowser/ src/documentation/ src/documentation/content/xdocs/ src/documentation/content/xdocs/hpsf/ src/documentation/content/xdocs/news/ src/documentat...

Modified: poi/tags/REL_3_5_BETA6/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithBorders.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithBorders.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithBorders.java (original)
+++ poi/tags/REL_3_5_BETA6/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithBorders.java Sun Jun  7 15:39:51 2009
@@ -1,58 +1,58 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.*;
-
-import java.io.FileOutputStream;
-
-/**
- * Working with borders
- */
-public class WorkingWithBorders {
-    public static void main(String[] args) throws Exception {
-        Workbook wb = new XSSFWorkbook();  //or new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("borders");
-
-        // Create a row and put some cells in it. Rows are 0 based.
-        Row row = sheet.createRow((short) 1);
-
-        // Create a cell and put a value in it.
-        Cell cell = row.createCell((short) 1);
-        cell.setCellValue(4);
-
-        // Style the cell with borders all around.
-        CellStyle style = wb.createCellStyle();
-        style.setBorderBottom(CellStyle.BORDER_THIN);
-        style.setBottomBorderColor(IndexedColors.BLACK.getIndex());
-        style.setBorderLeft(CellStyle.BORDER_THIN);
-        style.setLeftBorderColor(IndexedColors.GREEN.getIndex());
-        style.setBorderRight(CellStyle.BORDER_THIN);
-        style.setRightBorderColor(IndexedColors.BLUE.getIndex());
-        style.setBorderTop(CellStyle.BORDER_MEDIUM_DASHED);
-        style.setTopBorderColor(IndexedColors.BLACK.getIndex());
-        cell.setCellStyle(style);
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("xssf-borders.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-
-    }
-}
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.xssf.usermodel.examples;
+
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.*;
+
+import java.io.FileOutputStream;
+
+/**
+ * Working with borders
+ */
+public class WorkingWithBorders {
+    public static void main(String[] args) throws Exception {
+        Workbook wb = new XSSFWorkbook();  //or new HSSFWorkbook();
+        Sheet sheet = wb.createSheet("borders");
+
+        // Create a row and put some cells in it. Rows are 0 based.
+        Row row = sheet.createRow((short) 1);
+
+        // Create a cell and put a value in it.
+        Cell cell = row.createCell((short) 1);
+        cell.setCellValue(4);
+
+        // Style the cell with borders all around.
+        CellStyle style = wb.createCellStyle();
+        style.setBorderBottom(CellStyle.BORDER_THIN);
+        style.setBottomBorderColor(IndexedColors.BLACK.getIndex());
+        style.setBorderLeft(CellStyle.BORDER_THIN);
+        style.setLeftBorderColor(IndexedColors.GREEN.getIndex());
+        style.setBorderRight(CellStyle.BORDER_THIN);
+        style.setRightBorderColor(IndexedColors.BLUE.getIndex());
+        style.setBorderTop(CellStyle.BORDER_MEDIUM_DASHED);
+        style.setTopBorderColor(IndexedColors.BLACK.getIndex());
+        cell.setCellStyle(style);
+
+        // Write the output to a file
+        FileOutputStream fileOut = new FileOutputStream("xssf-borders.xlsx");
+        wb.write(fileOut);
+        fileOut.close();
+    }
+}

Modified: poi/tags/REL_3_5_BETA6/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithFonts.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithFonts.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithFonts.java (original)
+++ poi/tags/REL_3_5_BETA6/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithFonts.java Sun Jun  7 15:39:51 2009
@@ -1,100 +1,101 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.ss.usermodel.IndexedColors;
-
-import java.io.FileOutputStream;
-
-/**
- * Working with Fonts
- */
-public class WorkingWithFonts {
-    public static void main(String[] args) throws Exception {
-        Workbook wb = new XSSFWorkbook();  //or new HSSFWorkbook();
-        Sheet sheet = wb.createSheet("Fonts");
-
-        Font font0 = wb.createFont();
-        font0.setColor(IndexedColors.BROWN.getIndex());
-        CellStyle style0 = wb.createCellStyle();
-        style0.setFont(font0);
-
-        Font font1 = wb.createFont();
-        font1.setFontHeightInPoints((short)14);
-        font1.setFontName("Courier New");
-        font1.setColor(IndexedColors.RED.getIndex());
-        CellStyle style1 = wb.createCellStyle();
-        style1.setFont(font1);
-
-        Font font2 = wb.createFont();
-        font2.setFontHeightInPoints((short)16);
-        font2.setFontName("Arial");
-        font2.setColor(IndexedColors.GREEN.getIndex());
-        CellStyle style2 = wb.createCellStyle();
-        style2.setFont(font2);
-
-        Font font3 = wb.createFont();
-        font3.setFontHeightInPoints((short)18);
-        font3.setFontName("Times New Roman");
-        font3.setColor(IndexedColors.LAVENDER.getIndex());
-        CellStyle style3 = wb.createCellStyle();
-        style3.setFont(font3);
-
-        Font font4 = wb.createFont();
-        font4.setFontHeightInPoints((short)18);
-        font4.setFontName("Wingdings");
-        font4.setColor(IndexedColors.GOLD.getIndex());
-        CellStyle style4 = wb.createCellStyle();
-        style4.setFont(font4);
-
-        Font font5 = wb.createFont();
-        font5.setFontName("Symbol");
-        CellStyle style5 = wb.createCellStyle();
-        style5.setFont(font5);
-
-        Cell cell0 = sheet.createRow(0).createCell(1);
-        cell0.setCellValue("Default");
-        cell0.setCellStyle(style0);
-
-        Cell cell1 = sheet.createRow(1).createCell(1);
-        cell1.setCellValue("Courier");
-        cell1.setCellStyle(style1);
-
-        Cell cell2 = sheet.createRow(2).createCell(1);
-        cell2.setCellValue("Arial");
-        cell2.setCellStyle(style2);
-
-        Cell cell3 = sheet.createRow(3).createCell(1);
-        cell3.setCellValue("Times New Roman");
-        cell3.setCellStyle(style3);
-
-        Cell cell4 = sheet.createRow(4).createCell(1);
-        cell4.setCellValue("Wingdings");
-        cell4.setCellStyle(style4);
-
-        Cell cell5 = sheet.createRow(5).createCell(1);
-        cell5.setCellValue("Symbol");
-        cell5.setCellStyle(style5);
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("xssf-fonts.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-}
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.xssf.usermodel.examples;
+
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.poi.ss.usermodel.IndexedColors;
+
+import java.io.FileOutputStream;
+
+/**
+ * Working with Fonts
+ */
+public class WorkingWithFonts {
+    public static void main(String[] args) throws Exception {
+        Workbook wb = new XSSFWorkbook();  //or new HSSFWorkbook();
+        Sheet sheet = wb.createSheet("Fonts");
+
+        Font font0 = wb.createFont();
+        font0.setColor(IndexedColors.BROWN.getIndex());
+        CellStyle style0 = wb.createCellStyle();
+        style0.setFont(font0);
+
+        Font font1 = wb.createFont();
+        font1.setFontHeightInPoints((short)14);
+        font1.setFontName("Courier New");
+        font1.setColor(IndexedColors.RED.getIndex());
+        CellStyle style1 = wb.createCellStyle();
+        style1.setFont(font1);
+
+        Font font2 = wb.createFont();
+        font2.setFontHeightInPoints((short)16);
+        font2.setFontName("Arial");
+        font2.setColor(IndexedColors.GREEN.getIndex());
+        CellStyle style2 = wb.createCellStyle();
+        style2.setFont(font2);
+
+        Font font3 = wb.createFont();
+        font3.setFontHeightInPoints((short)18);
+        font3.setFontName("Times New Roman");
+        font3.setColor(IndexedColors.LAVENDER.getIndex());
+        CellStyle style3 = wb.createCellStyle();
+        style3.setFont(font3);
+
+        Font font4 = wb.createFont();
+        font4.setFontHeightInPoints((short)18);
+        font4.setFontName("Wingdings");
+        font4.setColor(IndexedColors.GOLD.getIndex());
+        CellStyle style4 = wb.createCellStyle();
+        style4.setFont(font4);
+
+        Font font5 = wb.createFont();
+        font5.setFontName("Symbol");
+        CellStyle style5 = wb.createCellStyle();
+        style5.setFont(font5);
+
+        Cell cell0 = sheet.createRow(0).createCell(1);
+        cell0.setCellValue("Default");
+        cell0.setCellStyle(style0);
+
+        Cell cell1 = sheet.createRow(1).createCell(1);
+        cell1.setCellValue("Courier");
+        cell1.setCellStyle(style1);
+
+        Cell cell2 = sheet.createRow(2).createCell(1);
+        cell2.setCellValue("Arial");
+        cell2.setCellStyle(style2);
+
+        Cell cell3 = sheet.createRow(3).createCell(1);
+        cell3.setCellValue("Times New Roman");
+        cell3.setCellStyle(style3);
+
+        Cell cell4 = sheet.createRow(4).createCell(1);
+        cell4.setCellValue("Wingdings");
+        cell4.setCellStyle(style4);
+
+        Cell cell5 = sheet.createRow(5).createCell(1);
+        cell5.setCellValue("Symbol");
+        cell5.setCellStyle(style5);
+
+        // Write the output to a file
+        FileOutputStream fileOut = new FileOutputStream("xssf-fonts.xlsx");
+        wb.write(fileOut);
+        fileOut.close();
+    }
+}

Modified: poi/tags/REL_3_5_BETA6/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithPictures.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithPictures.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithPictures.java (original)
+++ poi/tags/REL_3_5_BETA6/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithPictures.java Sun Jun  7 15:39:51 2009
@@ -1,70 +1,69 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import org.apache.poi.xssf.usermodel.*;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-
-/**
- * Demonstrates how to insert pictures in a SpreadsheetML document
- *
- * @author Yegor Kozlov
- */
-public class WorkingWithPictures {
-    public static void main(String[] args) throws IOException {
-
-        //create a new workbook
-        Workbook wb = new XSSFWorkbook(); //or new HSSFWorkbook();
-        CreationHelper helper = wb.getCreationHelper();
-
-        //add a picture in this workbook.
-        InputStream is = new FileInputStream(args[0]);
-        byte[] bytes = IOUtils.toByteArray(is);
-        is.close();
-        int pictureIdx = wb.addPicture(bytes, Workbook.PICTURE_TYPE_JPEG);
-
-        //create sheet
-        Sheet sheet = wb.createSheet();
-
-        //create drawing
-        Drawing drawing = sheet.createDrawingPatriarch();
-
-        //add a picture shape
-        ClientAnchor anchor = helper.createClientAnchor();
-        anchor.setCol1(1);
-        anchor.setRow1(1);
-        Picture pict = drawing.createPicture(anchor, pictureIdx);
-
-        //auto-size picture
-        pict.resize(2);
-
-        //save workbook
-        String file = "picture.xls";
-        if(wb instanceof XSSFWorkbook) file += "x";
-        FileOutputStream fileOut = new FileOutputStream(file);
-        wb.write(fileOut);
-        fileOut.close();
-
-    }
-}
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.xssf.usermodel.examples;
+
+import org.apache.poi.xssf.usermodel.*;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.util.IOUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+
+/**
+ * Demonstrates how to insert pictures in a SpreadsheetML document
+ *
+ * @author Yegor Kozlov
+ */
+public class WorkingWithPictures {
+    public static void main(String[] args) throws IOException {
+
+        //create a new workbook
+        Workbook wb = new XSSFWorkbook(); //or new HSSFWorkbook();
+        CreationHelper helper = wb.getCreationHelper();
+
+        //add a picture in this workbook.
+        InputStream is = new FileInputStream(args[0]);
+        byte[] bytes = IOUtils.toByteArray(is);
+        is.close();
+        int pictureIdx = wb.addPicture(bytes, Workbook.PICTURE_TYPE_JPEG);
+
+        //create sheet
+        Sheet sheet = wb.createSheet();
+
+        //create drawing
+        Drawing drawing = sheet.createDrawingPatriarch();
+
+        //add a picture shape
+        ClientAnchor anchor = helper.createClientAnchor();
+        anchor.setCol1(1);
+        anchor.setRow1(1);
+        Picture pict = drawing.createPicture(anchor, pictureIdx);
+
+        //auto-size picture
+        pict.resize(2);
+
+        //save workbook
+        String file = "picture.xls";
+        if(wb instanceof XSSFWorkbook) file += "x";
+        FileOutputStream fileOut = new FileOutputStream(file);
+        wb.write(fileOut);
+        fileOut.close();
+    }
+}

Modified: poi/tags/REL_3_5_BETA6/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithRichText.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithRichText.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithRichText.java (original)
+++ poi/tags/REL_3_5_BETA6/src/examples/src/org/apache/poi/xssf/usermodel/examples/WorkingWithRichText.java Sun Jun  7 15:39:51 2009
@@ -1,61 +1,61 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.xssf.usermodel.examples;
-
-import org.apache.poi.xssf.usermodel.*;
-
-import java.io.FileOutputStream;
-
-/**
- * Demonstrates how to work with rich text
- */
-public class WorkingWithRichText {
-
-    public static void main(String[] args) throws Exception {
-
-        XSSFWorkbook wb = new XSSFWorkbook(); //or new HSSFWorkbook();
-
-        XSSFSheet sheet = wb.createSheet();
-        XSSFRow row = sheet.createRow((short) 2);
-
-        XSSFCell cell = row.createCell(1);
-        XSSFRichTextString rt = new XSSFRichTextString("The quick brown fox");
-
-        XSSFFont font1 = wb.createFont();
-        font1.setBold(true);
-        font1.setColor(new XSSFColor(new java.awt.Color(255, 0, 0)));
-        rt.applyFont(0, 10, font1);
-
-        XSSFFont font2 = wb.createFont();
-        font2.setItalic(true);
-        font2.setUnderline(XSSFFont.U_DOUBLE);
-        font2.setColor(new XSSFColor(new java.awt.Color(0, 255, 0)));
-        rt.applyFont(10, 19, font2);
-
-        XSSFFont font3 = wb.createFont();
-        font3.setColor(new XSSFColor(new java.awt.Color(0, 0, 255)));
-        rt.append(" Jumped over the lazy dog", font3);
-
-        cell.setCellValue(rt);
-
-        // Write the output to a file
-        FileOutputStream fileOut = new FileOutputStream("xssf-richtext.xlsx");
-        wb.write(fileOut);
-        fileOut.close();
-    }
-
-}
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.xssf.usermodel.examples;
+
+import org.apache.poi.xssf.usermodel.*;
+
+import java.io.FileOutputStream;
+
+/**
+ * Demonstrates how to work with rich text
+ */
+public class WorkingWithRichText {
+
+    public static void main(String[] args) throws Exception {
+
+        XSSFWorkbook wb = new XSSFWorkbook(); //or new HSSFWorkbook();
+
+        XSSFSheet sheet = wb.createSheet();
+        XSSFRow row = sheet.createRow((short) 2);
+
+        XSSFCell cell = row.createCell(1);
+        XSSFRichTextString rt = new XSSFRichTextString("The quick brown fox");
+
+        XSSFFont font1 = wb.createFont();
+        font1.setBold(true);
+        font1.setColor(new XSSFColor(new java.awt.Color(255, 0, 0)));
+        rt.applyFont(0, 10, font1);
+
+        XSSFFont font2 = wb.createFont();
+        font2.setItalic(true);
+        font2.setUnderline(XSSFFont.U_DOUBLE);
+        font2.setColor(new XSSFColor(new java.awt.Color(0, 255, 0)));
+        rt.applyFont(10, 19, font2);
+
+        XSSFFont font3 = wb.createFont();
+        font3.setColor(new XSSFColor(new java.awt.Color(0, 0, 255)));
+        rt.append(" Jumped over the lazy dog", font3);
+
+        cell.setCellValue(rt);
+
+        // Write the output to a file
+        FileOutputStream fileOut = new FileOutputStream("xssf-richtext.xlsx");
+        wb.write(fileOut);
+        fileOut.close();
+    }
+}

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/ddf/EscherBitmapBlip.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/ddf/EscherBitmapBlip.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/ddf/EscherBitmapBlip.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/ddf/EscherBitmapBlip.java Sun Jun  7 15:39:51 2009
@@ -1,19 +1,20 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
 package org.apache.poi.ddf;
 
 import org.apache.poi.util.HexDump;
@@ -23,7 +24,6 @@
 
 /**
  * @author Glen Stampoultzis
- * @version $Id$
  */
 public class EscherBitmapBlip extends EscherBlipRecord {
     public static final short RECORD_ID_JPEG = (short) 0xF018 + 5;

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/ClassID.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/ClassID.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/ClassID.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/ClassID.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 import org.apache.poi.util.HexDump;
@@ -27,8 +27,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @version $Id$
- * @since 2002-02-09
  */
 public class ClassID
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Constants.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Constants.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Constants.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Constants.java Sun Jun  7 15:39:51 2009
@@ -22,8 +22,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @since 2004-06-20
- * @version $Id$
  */
 public class Constants
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/CustomProperties.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/CustomProperties.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/CustomProperties.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/CustomProperties.java Sun Jun  7 15:39:51 2009
@@ -47,12 +47,10 @@
  * unmodified) or whether one or more properties have been dropped.</p>
  * 
  * <p>This class is not thread-safe; concurrent access to instances of this
- * class must be syncronized.</p>
+ * class must be synchronized.</p>
  * 
  * @author Rainer Klute <a
  *         href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @since 2006-02-09
- * @version $Id$
  */
 public class CustomProperties extends HashMap
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/CustomProperty.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/CustomProperty.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/CustomProperty.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/CustomProperty.java Sun Jun  7 15:39:51 2009
@@ -18,15 +18,13 @@
 package org.apache.poi.hpsf;
 
 /**
- * <p>This class represents custum properties in the document summary
+ * <p>This class represents custom properties in the document summary
  * information stream. The difference to normal properties is that custom
  * properties have an optional name. If the name is not <code>null</code> it
  * will be maintained in the section's dictionary.</p>
  * 
  * @author Rainer Klute <a
  *         href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @since 2006-02-09
- * @version $Id$
  */
 public class CustomProperty extends MutableProperty
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/DocumentSummaryInformation.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/DocumentSummaryInformation.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/DocumentSummaryInformation.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/DocumentSummaryInformation.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 import java.util.Iterator;
@@ -32,8 +32,6 @@
  * @author Drew Varner (Drew.Varner closeTo sc.edu)
  * @author robert_flaherty@hyperion.com
  * @see SummaryInformation
- * @version $Id$
- * @since 2002-02-09
  */
 public class DocumentSummaryInformation extends SpecialPropertySet
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/HPSFException.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/HPSFException.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/HPSFException.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/HPSFException.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 /**
@@ -24,8 +24,6 @@
  * 
  * @author Rainer Klute <a
  *         href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @version $Id$
- * @since 2002-02-09
  */
 public class HPSFException extends Exception
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 import java.io.PrintStream;
@@ -27,8 +27,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @version $Id$
- * @since 2002-02-09
  */
 public class HPSFRuntimeException extends RuntimeException
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 /**
@@ -26,8 +26,6 @@
  * thrown.</p>
  *
  * @author Drew Varner(Drew.Varner atDomain sc.edu)
- * @version $Id$
- * @since 2002-05-26
  */
 public class IllegalPropertySetDataException extends HPSFRuntimeException
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/IllegalVariantTypeException.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/IllegalVariantTypeException.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/IllegalVariantTypeException.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/IllegalVariantTypeException.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 import org.apache.poi.util.HexDump;
@@ -25,8 +25,6 @@
  * 
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @since 2004-06-21
- * @version $Id$
  */
 public class IllegalVariantTypeException extends VariantTypeException
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MarkUnsupportedException.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MarkUnsupportedException.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MarkUnsupportedException.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MarkUnsupportedException.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 /**
@@ -23,8 +23,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @version $Id$
- * @since 2002-02-09
  */
 public class MarkUnsupportedException extends HPSFException
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MissingSectionException.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MissingSectionException.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MissingSectionException.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MissingSectionException.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 /**
@@ -26,8 +26,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @version $Id: NoSingleSectionException.java 353545 2004-04-09 13:05:39Z glens $
- * @since 2006-02-08
  */
 public class MissingSectionException extends HPSFRuntimeException
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MutableProperty.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MutableProperty.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MutableProperty.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MutableProperty.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 import java.io.IOException;
@@ -28,8 +28,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @since 2003-08-03
- * @version $Id$
  */
 public class MutableProperty extends Property
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MutablePropertySet.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MutablePropertySet.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MutablePropertySet.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MutablePropertySet.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 import java.io.ByteArrayInputStream;
@@ -33,8 +33,6 @@
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.LittleEndianConsts;
 
-
-
 /**
  * <p>Adds writing support to the {@link PropertySet} class.</p>
  *
@@ -43,8 +41,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @version $Id$
- * @since 2003-02-19
  */
 public class MutablePropertySet extends PropertySet
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MutableSection.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MutableSection.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MutableSection.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/MutableSection.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 import java.io.ByteArrayOutputStream;
@@ -37,9 +37,6 @@
  *
  * <p>Please be aware that this class' functionality will be merged into the
  * {@link Section} class at a later time, so the API will change.</p>
- *
- * @version $Id$
- * @since 2002-02-20
  */
 public class MutableSection extends Section
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/NoFormatIDException.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/NoFormatIDException.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/NoFormatIDException.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/NoFormatIDException.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 /**
@@ -25,8 +25,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @version $Id$
- * @since 2002-09-03
  */
 public class NoFormatIDException extends HPSFRuntimeException
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/NoPropertySetStreamException.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/NoPropertySetStreamException.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/NoPropertySetStreamException.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/NoPropertySetStreamException.java Sun Jun  7 15:39:51 2009
@@ -1,4 +1,3 @@
-
 /* ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -15,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 /**
@@ -27,8 +26,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @version $Id$
- * @since 2002-02-09
  */
 public class NoPropertySetStreamException extends HPSFException
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/NoSingleSectionException.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/NoSingleSectionException.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/NoSingleSectionException.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/NoSingleSectionException.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 /**
@@ -28,8 +28,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @version $Id$
- * @since 2002-02-09
  */
 public class NoSingleSectionException extends HPSFRuntimeException
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Property.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Property.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Property.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Property.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 import java.io.UnsupportedEncodingException;
@@ -56,8 +56,6 @@
  * @author Drew Varner (Drew.Varner InAndAround sc.edu)
  * @see Section
  * @see Variant
- * @version $Id$
- * @since 2002-02-09
  */
 public class Property
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/PropertySet.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/PropertySet.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/PropertySet.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/PropertySet.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 import java.io.IOException;
@@ -57,8 +57,6 @@
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
  * @author Drew Varner (Drew.Varner hanginIn sc.edu)
- * @version $Id$
- * @since 2002-02-09
  */
 public class PropertySet
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/PropertySetFactory.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/PropertySetFactory.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/PropertySetFactory.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/PropertySetFactory.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 import java.io.InputStream;
@@ -30,8 +30,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @version $Id$
- * @since 2002-02-09
  */
 public class PropertySetFactory
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/ReadingNotSupportedException.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/ReadingNotSupportedException.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/ReadingNotSupportedException.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/ReadingNotSupportedException.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 /**
@@ -26,8 +26,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @since 2003-08-08
- * @version $Id$
  */
 public class ReadingNotSupportedException
     extends UnsupportedVariantTypeException

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Section.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Section.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Section.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Section.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 import java.io.UnsupportedEncodingException;
@@ -34,8 +34,6 @@
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
  * @author Drew Varner (Drew.Varner allUpIn sc.edu)
- * @version $Id$
- * @since 2002-02-09
  */
 public class Section
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/SpecialPropertySet.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/SpecialPropertySet.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/SpecialPropertySet.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/SpecialPropertySet.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 import java.io.IOException;
@@ -53,8 +53,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @version $Id$
- * @since 2002-02-09
  */
 public abstract class SpecialPropertySet extends MutablePropertySet
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/SummaryInformation.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/SummaryInformation.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/SummaryInformation.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/SummaryInformation.java Sun Jun  7 15:39:51 2009
@@ -28,8 +28,6 @@
  * @author Rainer Klute <a
  *         href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
  * @see DocumentSummaryInformation
- * @version $Id$
- * @since 2002-02-09
  */
 public class SummaryInformation extends SpecialPropertySet
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Thumbnail.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Thumbnail.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Thumbnail.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Thumbnail.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 import org.apache.poi.util.LittleEndian;
@@ -24,8 +24,6 @@
  *
  * @author Drew Varner (Drew.Varner inOrAround sc.edu)
  * @see SummaryInformation#getThumbnail()
- * @version $Id$
- * @since 2002-04-29
  */
 public class Thumbnail
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/TypeWriter.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/TypeWriter.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/TypeWriter.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/TypeWriter.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 import java.io.IOException;
@@ -27,8 +27,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @version $Id$
- * @since 2003-02-20
  */
 public class TypeWriter
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 /**
@@ -27,8 +27,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @version $Id$
- * @since 2002-02-09
  */
 public class UnexpectedPropertySetTypeException extends HPSFException
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 import org.apache.poi.util.HexDump;
@@ -28,8 +28,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @since 2003-08-05
- * @version $Id$
  */
 public abstract class UnsupportedVariantTypeException
 extends VariantTypeException

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Util.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Util.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Util.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Util.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 import java.io.IOException;
@@ -27,8 +27,6 @@
  * <p>Provides various static utility methods.</p>
  *
  * @author Rainer Klute (klute@rainer-klute.de)
- * @version $Id$
- * @since 2002-02-09
  */
 public class Util
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Variant.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Variant.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Variant.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/Variant.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 import java.util.Collections;
@@ -34,8 +34,6 @@
  * <strong>[S]</strong> - may appear in a Safe Array.</p>
  *
  * @author Rainer Klute (klute@rainer-klute.de)
- * @version $Id$
- * @since 2002-02-09
  */
 public class Variant
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/VariantSupport.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/VariantSupport.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/VariantSupport.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/VariantSupport.java Sun Jun  7 15:39:51 2009
@@ -45,8 +45,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @since 2003-08-08
- * @version $Id$
  */
 public class VariantSupport extends Variant
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/VariantTypeException.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/VariantTypeException.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/VariantTypeException.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/VariantTypeException.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 /**
@@ -23,8 +23,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @since 2004-06-21
- * @version $Id$
  */
 public abstract class VariantTypeException extends HPSFException
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/WritingNotSupportedException.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/WritingNotSupportedException.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/WritingNotSupportedException.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/WritingNotSupportedException.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf;
 
 /**
@@ -26,8 +26,6 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @since 2003-08-08
- * @version $Id$
  */
 public class WritingNotSupportedException
     extends UnsupportedVariantTypeException

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/package.html
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/package.html?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/package.html (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/package.html Sun Jun  7 15:39:51 2009
@@ -138,8 +138,6 @@
 
    <p>
     @author Rainer Klute (klute@rainer-klute.de)
-    @version $Id$
-    @since 2002-02-09
    </p>
   </div>
 

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf.wellknown;
 
 import java.util.Collections;
@@ -33,11 +33,8 @@
  *
  * @author Rainer Klute <a
  * href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
- * @version $Id$
- * @since 2002-02-09
  */
-public class PropertyIDMap extends HashMap
-{
+public class PropertyIDMap extends HashMap {
 
     /*
      * The following definitions are for property IDs in the first

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/wellknown/SectionIDMap.java Sun Jun  7 15:39:51 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hpsf.wellknown;
 
 import java.util.HashMap;
@@ -35,11 +35,8 @@
  * property IDs in sections with the specified section format ID.</p>
  *
  * @author Rainer Klute (klute@rainer-klute.de)
- * @version $Id$
- * @since 2002-02-09
  */
-public class SectionIDMap extends HashMap
-{
+public class SectionIDMap extends HashMap {
 
     /**
      * <p>The SummaryInformation's section's format ID.</p>

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/wellknown/package.html
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/wellknown/package.html?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/wellknown/package.html (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hpsf/wellknown/package.html Sun Jun  7 15:39:51 2009
@@ -33,8 +33,6 @@
 
    <p>
     @author Rainer Klute (klute@rainer-klute.de)
-    @version $Id$
-    @since 2002-02-09
    </p>
   </div>
 

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java Sun Jun  7 15:39:51 2009
@@ -293,10 +293,8 @@
 			}
 			
 			// Header text, if there is any
-			if(_includeHeadersFooters && sheet.getHeader() != null) {
-				text.append(
-						_extractHeaderFooter(sheet.getHeader())
-				);
+			if(_includeHeadersFooters) {
+				text.append(_extractHeaderFooter(sheet.getHeader()));
 			}
 			
 			int firstRow = sheet.getFirstRowNum();
@@ -382,11 +380,9 @@
 				text.append("\n");
 			}
 			
-			// Finally Feader text, if there is any
-			if(_includeHeadersFooters && sheet.getFooter() != null) {
-				text.append(
-						_extractHeaderFooter(sheet.getFooter())
-				);
+			// Finally Footer text, if there is any
+			if(_includeHeadersFooters) {
+				text.append(_extractHeaderFooter(sheet.getFooter()));
 			}
 		}
 		

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/CommentShape.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/CommentShape.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/CommentShape.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/CommentShape.java Sun Jun  7 15:39:51 2009
@@ -74,10 +74,10 @@
      private NoteRecord createNoteRecord( HSSFComment shape, int shapeId )
     {
         NoteRecord note = new NoteRecord();
-        note.setColumn((short)shape.getColumn());
-        note.setRow((short)shape.getRow());
+        note.setColumn(shape.getColumn());
+        note.setRow(shape.getRow());
         note.setFlags(shape.isVisible() ? NoteRecord.NOTE_VISIBLE : NoteRecord.NOTE_HIDDEN);
-        note.setShapeId((short)shapeId);
+        note.setShapeId(shapeId);
         note.setAuthor(shape.getAuthor() == null ? "" : shape.getAuthor());
         return note;
     }

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/ConvertAnchor.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/ConvertAnchor.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/ConvertAnchor.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/ConvertAnchor.java Sun Jun  7 15:39:51 2009
@@ -25,7 +25,7 @@
 import org.apache.poi.hssf.usermodel.HSSFChildAnchor;
 
 /**
- * $Id$
+ *
  */
 public class ConvertAnchor
 {

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/LineShape.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/LineShape.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/LineShape.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/LineShape.java Sun Jun  7 15:39:51 2009
@@ -97,7 +97,7 @@
         ObjRecord obj = new ObjRecord();
         CommonObjectDataSubRecord c = new CommonObjectDataSubRecord();
         c.setObjectType((short) ((HSSFSimpleShape)shape).getShapeType());
-        c.setObjectId((short) ( shapeId ));
+        c.setObjectId(shapeId);
         c.setLocked(true);
         c.setPrintable(true);
         c.setAutofill(true);

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/PictureShape.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/PictureShape.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/PictureShape.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/PictureShape.java Sun Jun  7 15:39:51 2009
@@ -100,7 +100,7 @@
         CommonObjectDataSubRecord c = new CommonObjectDataSubRecord();
         c.setObjectType((short) ((HSSFSimpleShape)shape).getShapeType());
 //        c.setObjectId((short) ( 1 ));
-        c.setObjectId((short) ( shapeId ));
+        c.setObjectId(shapeId);
         c.setLocked(true);
         c.setPrintable(true);
         c.setAutofill(true);

Modified: poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/PolygonShape.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/PolygonShape.java?rev=782402&r1=782401&r2=782402&view=diff
==============================================================================
--- poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/PolygonShape.java (original)
+++ poi/tags/REL_3_5_BETA6/src/java/org/apache/poi/hssf/model/PolygonShape.java Sun Jun  7 15:39:51 2009
@@ -134,7 +134,7 @@
         ObjRecord obj = new ObjRecord();
         CommonObjectDataSubRecord c = new CommonObjectDataSubRecord();
         c.setObjectType( OBJECT_TYPE_MICROSOFT_OFFICE_DRAWING );
-        c.setObjectId( (short) ( shapeId ) );
+        c.setObjectId(shapeId);
         c.setLocked( true );
         c.setPrintable( true );
         c.setAutofill( true );



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org