INTEGRATION: CWS lo8 (1.5.28); FILE MERGED

2005/08/23 12:12:26 lo 1.5.28.1: #113679# master docuemnt and better oasis support

1 files changed, 19 insertions, 10 deletions

diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
index 9b3490850dff..83f8b798cf6f 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filterdetect.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-01-31 16:45:21 $
+ *  last change: $Author: hr $ $Date: 2005-10-24 18:27:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  the BSD license.
@@ -202,17 +202,26 @@ OUString SAL_CALL FilterDetect::detect(Sequence< PropertyValue >& aArguments )
             n += aMimeTypeToken.getLength();
             OString aMimeType = aHead.copy(n, aHead.indexOf('\"', n) - n);
             // return type for class found
-            if      (aMimeType.equals("application/x-vnd.oasis.openoffice.text") ||
-                     aMimeType.equals("application/vnd.oasis.openoffice.text"))
+            if      (aMimeType.equals("application/x-vnd.oasis.opendocument.text") ||
+                       aMimeType.equals("application/vnd.oasis.opendocument.text"))
                 sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_writer");
-            else if (aMimeType.equals("application/x-vnd.oasis.openoffice.spreadsheet") ||
-                     aMimeType.equals("application/vnd.oasis.openoffice.spreadsheet"))
+            else if (aMimeType.equals("application/x-vnd.oasis.opendocument.text-master") ||
+                       aMimeType.equals("application/vnd.oasis.opendocument.text-master"))
+                sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_master");
+           else if (aMimeType.equals("application/x-vnd.oasis.openoffice.text-global") ||
+                      aMimeType.equals("application/vnd.oasis.openoffice.text-global"))
+                sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_master");
+           else if (aMimeType.equals("application/x-vnd.oasis.opendocument.spreadsheet") ||
+                       aMimeType.equals("application/vnd.oasis.opendocument.spreadsheet"))
                 sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_calc");
-            else if (aMimeType.equals("application/x-vnd.oasis.openoffice.drawing") ||
-                     aMimeType.equals("application/vnd.oasis.openoffice.drawing"))
+            else if (aMimeType.equals("application/x-vnd.oasis.opendocument.drawing") ||
+                       aMimeType.equals("application/vnd.oasis.opendocument.drawing"))
                 sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_draw");
-            else if (aMimeType.equals("application/x-vnd.oasis.openoffice.presentation") ||
-                     aMimeType.equals("application/vnd.oasis.openoffice.presentation"))
+            else if (aMimeType.equals("application/x-vnd.oasis.opendocument.presentation") ||
+                       aMimeType.equals("application/vnd.oasis.opendocument.presentation"))
+                sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_impress");
+            else if (aMimeType.equals("application/x-vnd.oasis.opendocument.presentation") ||
+                       aMimeType.equals("application/vnd.oasis.opendocument.presentation"))
                 sTypeName = OUString::createFromAscii("devguide_FlatXMLType_Cpp_impress");
         }
     }