diff --git a/config/alfresco/mimetype-map.xml b/config/alfresco/mimetype-map.xml
index 25774a31ec..be73b29e78 100644
--- a/config/alfresco/mimetype-map.xml
+++ b/config/alfresco/mimetype-map.xml
@@ -329,6 +329,12 @@
          <mimetype mimetype="application/vnd.sun.xml.writer" display="OpenOffice 1.0/StarOffice6.0 Writer 6.0">
            <extension>sxw</extension>
          </mimetype>
+         <mimetype mimetype="application/vnd.sun.xml.calc" display="OpenOffice 1.0/StarOffice6.0 Calc 6.0">
+           <extension>sxc</extension>
+         </mimetype>
+         <mimetype mimetype="application/vnd.stardivision.calc" display="StarCalc 5.x Spreadsheet">
+           <extension>sdc</extension>
+         </mimetype>
          <mimetype mimetype="image/x-dwg" display="AutoCAD Drawing">
             <extension>dwg</extension>
          </mimetype>
diff --git a/source/java/org/alfresco/repo/content/MimetypeMap.java b/source/java/org/alfresco/repo/content/MimetypeMap.java
index eae9b9036e..2c1b443462 100644
--- a/source/java/org/alfresco/repo/content/MimetypeMap.java
+++ b/source/java/org/alfresco/repo/content/MimetypeMap.java
@@ -54,6 +54,7 @@ public class MimetypeMap implements MimetypeService
     public static final String MIMETYPE_IMAGE_GIF = "image/gif";
     public static final String MIMETYPE_IMAGE_JPEG = "image/jpeg";
     public static final String MIMETYPE_IMAGE_RGB = "image/x-rgb";
+    // Open Document
     public static final String MIMETYPE_OPENDOCUMENT_TEXT = "application/vnd.oasis.opendocument.text";
     public static final String MIMETYPE_OPENDOCUMENT_TEXT_TEMPLATE = "application/vnd.oasis.opendocument.text-template";
     public static final String MIMETYPE_OPENDOCUMENT_GRAPHICS = "application/vnd.oasis.opendocument.graphics";
@@ -71,8 +72,14 @@ public class MimetypeMap implements MimetypeService
     public static final String MIMETYPE_OPENDOCUMENT_TEXT_MASTER= "application/vnd.oasis.opendocument.text-master";
     public static final String MIMETYPE_OPENDOCUMENT_TEXT_WEB= "application/vnd.oasis.opendocument.text-web";
     public static final String MIMETYPE_OPENDOCUMENT_DATABASE= "application/vnd.oasis.opendocument.database";
+    // Open Office
     public static final String MIMETYPE_OPENOFFICE_WRITER = "application/vnd.sun.xml.writer";
+    public static final String MIMETYPE_OPENOFFICE_CALC = "application/vnd.sun.xml.calc";
+    // Star Office
+    public static final String MIMETYPE_STAROFFICE5_SPREADSHEET = "application/vnd.stardivision.calc";
+    // Audio
     public static final String MIMETYPE_MP3 = "audio/x-mpeg";
+    // Alfresco
     public static final String MIMETYPE_ACP = "application/acp";
     
     private static final String CONFIG_AREA = "mimetype-map";
diff --git a/source/java/org/alfresco/repo/content/transform/UnoContentTransformer.java b/source/java/org/alfresco/repo/content/transform/UnoContentTransformer.java
index bc9f06b6ff..c86408a920 100644
--- a/source/java/org/alfresco/repo/content/transform/UnoContentTransformer.java
+++ b/source/java/org/alfresco/repo/content/transform/UnoContentTransformer.java
@@ -54,11 +54,26 @@ public class UnoContentTransformer extends AbstractContentTransformer
         formatsByConversion = new HashMap<ContentTransformerRegistry.TransformationKey, DocumentFormatWrapper>(17);
         
         formatsByConversion.put(
-                new ContentTransformerRegistry.TransformationKey(MimetypeMap.MIMETYPE_OPENOFFICE_WRITER, MimetypeMap.MIMETYPE_TEXT_PLAIN),
-                new DocumentFormatWrapper(DocumentFormat.TEXT, 1.0));
+                new ContentTransformerRegistry.TransformationKey(MimetypeMap.MIMETYPE_OPENDOCUMENT_SPREADSHEET, MimetypeMap.MIMETYPE_PDF),
+                new DocumentFormatWrapper(DocumentFormat.PDF_CALC, 1.0));
         formatsByConversion.put(
                 new ContentTransformerRegistry.TransformationKey(MimetypeMap.MIMETYPE_OPENDOCUMENT_TEXT, MimetypeMap.MIMETYPE_TEXT_PLAIN),
                 new DocumentFormatWrapper(DocumentFormat.TEXT, 1.0));
+        formatsByConversion.put(
+                new ContentTransformerRegistry.TransformationKey(MimetypeMap.MIMETYPE_OPENDOCUMENT_TEXT, MimetypeMap.MIMETYPE_PDF),
+                new DocumentFormatWrapper(DocumentFormat.PDF_WRITER, 1.0));
+        formatsByConversion.put(
+                new ContentTransformerRegistry.TransformationKey(MimetypeMap.MIMETYPE_OPENOFFICE_WRITER, MimetypeMap.MIMETYPE_TEXT_PLAIN),
+                new DocumentFormatWrapper(DocumentFormat.TEXT, 1.0));
+        formatsByConversion.put(
+                new ContentTransformerRegistry.TransformationKey(MimetypeMap.MIMETYPE_OPENOFFICE_WRITER, MimetypeMap.MIMETYPE_PDF),
+                new DocumentFormatWrapper(DocumentFormat.PDF_WRITER, 1.0));
+        formatsByConversion.put(
+                new ContentTransformerRegistry.TransformationKey(MimetypeMap.MIMETYPE_OPENOFFICE_CALC, MimetypeMap.MIMETYPE_PDF),
+                new DocumentFormatWrapper(DocumentFormat.PDF_WRITER, 1.0));
+        formatsByConversion.put(
+                new ContentTransformerRegistry.TransformationKey(MimetypeMap.MIMETYPE_STAROFFICE5_SPREADSHEET, MimetypeMap.MIMETYPE_PDF),
+                new DocumentFormatWrapper(DocumentFormat.PDF_WRITER, 1.0));
         formatsByConversion.put(
                 new ContentTransformerRegistry.TransformationKey(MimetypeMap.MIMETYPE_TEXT_PLAIN, MimetypeMap.MIMETYPE_HTML),
                 new DocumentFormatWrapper(DocumentFormat.HTML_WRITER, 1.0));
diff --git a/source/test-resources/quick/quick.ods b/source/test-resources/quick/quick.ods
new file mode 100644
index 0000000000..ccb7abaf25
Binary files /dev/null and b/source/test-resources/quick/quick.ods differ
diff --git a/source/test-resources/quick/quick.sdc b/source/test-resources/quick/quick.sdc
new file mode 100644
index 0000000000..e40a82a3b1
Binary files /dev/null and b/source/test-resources/quick/quick.sdc differ
diff --git a/source/test-resources/quick/quick.sxc b/source/test-resources/quick/quick.sxc
new file mode 100644
index 0000000000..a7373d2b5a
Binary files /dev/null and b/source/test-resources/quick/quick.sxc differ