[Libreoffice-commits] .: 3 commits - svl/inc svl/source

Michael Meeks michael at kemper.freedesktop.org
Tue Oct 18 06:17:10 PDT 2011


 svl/inc/svl/inettype.hxx     |   81 -----------------
 svl/inc/svl/svl.hrc          |  131 ++++++++++------------------
 svl/source/misc/inettype.cxx |  106 -----------------------
 svl/source/misc/mediatyp.src |  196 -------------------------------------------
 4 files changed, 46 insertions(+), 468 deletions(-)

New commits:
commit d6f2418d0828ec4275355502ae3f87c80e16e8f5
Author: Lior Kaplan <kaplanlior at gmail.com>
Date:   Mon Oct 17 20:41:27 2011 +0200

    Align a rebellious line

diff --git a/svl/inc/svl/svl.hrc b/svl/inc/svl/svl.hrc
index 5c0d061..2ac8213 100644
--- a/svl/inc/svl/svl.hrc
+++ b/svl/inc/svl/svl.hrc
@@ -54,7 +54,7 @@
 #define STR_SVT_MIMETYPE_TEXT_PLAIN         (STR_SVT_MIMETYPE_START+21)
 #define STR_SVT_MIMETYPE_TEXT_URL           (STR_SVT_MIMETYPE_START+22)
 #define STR_SVT_MIMETYPE_TEXT_VCARD         (STR_SVT_MIMETYPE_START+23)
-#define STR_SVT_MIMETYPE_VIDEO_THEORA           (STR_SVT_MIMETYPE_START+24)
+#define STR_SVT_MIMETYPE_VIDEO_THEORA       (STR_SVT_MIMETYPE_START+24)
 #define STR_SVT_MIMETYPE_VIDEO_VDO          (STR_SVT_MIMETYPE_START+25)
 #define STR_SVT_MIMETYPE_VIDEO_MSVIDEO      (STR_SVT_MIMETYPE_START+26)
 #define STR_SVT_MIMETYPE_X_STARMAIL         (STR_SVT_MIMETYPE_START+27)
commit 89a4f63bc56c7525f9e1d3e5b5d30859536b062e
Author: Lior Kaplan <kaplanlior at gmail.com>
Date:   Mon Oct 17 20:40:26 2011 +0200

    Compact the enumeration spaces from previous commit

diff --git a/svl/inc/svl/svl.hrc b/svl/inc/svl/svl.hrc
index 1bc3cde..5c0d061 100644
--- a/svl/inc/svl/svl.hrc
+++ b/svl/inc/svl/svl.hrc
@@ -66,93 +66,54 @@
 #define STR_SVT_MIMETYPE_APP_SCHED_TASK     (STR_SVT_MIMETYPE_START+33)
 #define STR_SVT_MIMETYPE_APP_SCHED_TVIEW    (STR_SVT_MIMETYPE_START+34)
 
-(STR_SVT_MIMETYPE_START+35)
-(STR_SVT_MIMETYPE_START+36)
-(STR_SVT_MIMETYPE_START+37)
-(STR_SVT_MIMETYPE_START+38)
-(STR_SVT_MIMETYPE_START+39)
-(STR_SVT_MIMETYPE_START+40)
-(STR_SVT_MIMETYPE_START+41)
-(STR_SVT_MIMETYPE_START+42)
-(STR_SVT_MIMETYPE_START+43)
-(STR_SVT_MIMETYPE_START+44)
-(STR_SVT_MIMETYPE_START+45)
-(STR_SVT_MIMETYPE_START+46)
-(STR_SVT_MIMETYPE_START+47)
-(STR_SVT_MIMETYPE_START+48)
-(STR_SVT_MIMETYPE_START+49)
-(STR_SVT_MIMETYPE_START+50)
-(STR_SVT_MIMETYPE_START+51)
-#define STR_SVT_MIMETYPE_CNT_FSYSBOX        (STR_SVT_MIMETYPE_START+52)
-#define STR_SVT_MIMETYPE_CNT_FSYSFLD        (STR_SVT_MIMETYPE_START+53)
-(STR_SVT_MIMETYPE_START+54)
-(STR_SVT_MIMETYPE_START+55)
-(STR_SVT_MIMETYPE_START+56)
-(STR_SVT_MIMETYPE_START+57)
-(STR_SVT_MIMETYPE_START+58)
-(STR_SVT_MIMETYPE_START+59)
-(STR_SVT_MIMETYPE_START+60)
-(STR_SVT_MIMETYPE_START+61)
-(STR_SVT_MIMETYPE_START+62)
-(STR_SVT_MIMETYPE_START+63)
-(STR_SVT_MIMETYPE_START+64)
-(STR_SVT_MIMETYPE_START+65)
-(STR_SVT_MIMETYPE_START+66)
-(STR_SVT_MIMETYPE_START+67)
-(STR_SVT_MIMETYPE_START+68)
-(STR_SVT_MIMETYPE_START+69)
-(STR_SVT_MIMETYPE_START+70)
-(STR_SVT_MIMETYPE_START+71)
-(STR_SVT_MIMETYPE_START+72)
-(STR_SVT_MIMETYPE_START+73)
-#define STR_SVT_MIMETYPE_APP_GAL            (STR_SVT_MIMETYPE_START+74)
-#define STR_SVT_MIMETYPE_APP_GAL_THEME      (STR_SVT_MIMETYPE_START+75)
-(STR_SVT_MIMETYPE_START+76)
-#define STR_SVT_MIMETYPE_APP_STARW_GLOB     (STR_SVT_MIMETYPE_START+77)
-#define STR_SVT_MIMETYPE_APP_SDM            (STR_SVT_MIMETYPE_START+78)
-#define STR_SVT_MIMETYPE_APP_SMD            (STR_SVT_MIMETYPE_START+79)
-#define STR_SVT_MIMETYPE_APP_STARW_WEB      (STR_SVT_MIMETYPE_START+80)
-#define STR_SVT_MIMETYPE_SCHEDULE           (STR_SVT_MIMETYPE_START+81)
-#define STR_SVT_MIMETYPE_SCHEDULE_EVT       (STR_SVT_MIMETYPE_START+82)
-#define STR_SVT_MIMETYPE_SCHEDULE_TASK      (STR_SVT_MIMETYPE_START+83)
-#define STR_SVT_MIMETYPE_SCHEDULE_FEVT      (STR_SVT_MIMETYPE_START+84)
-#define STR_SVT_MIMETYPE_SCHEDULE_FTASK     (STR_SVT_MIMETYPE_START+85)
-#define STR_SVT_MIMETYPE_FRAMESET           (STR_SVT_MIMETYPE_START+86)
-#define STR_SVT_MIMETYPE_MACRO              (STR_SVT_MIMETYPE_START+87)
-#define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER    (STR_SVT_MIMETYPE_START+88)
-(STR_SVT_MIMETYPE_START+89)
-#define STR_SVT_MIMETYPE_APP_TEMPLATE       (STR_SVT_MIMETYPE_START+90)
-#define STR_SVT_MIMETYPE_IMAGE_GENERIC      (STR_SVT_MIMETYPE_START+91)
-#define STR_SVT_MIMETYPE_APP_MSEXCEL        (STR_SVT_MIMETYPE_START+92)
-#define STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL  (STR_SVT_MIMETYPE_START+93)
-#define STR_SVT_MIMETYPE_APP_MSPPOINT       (STR_SVT_MIMETYPE_START+94)
-#define STR_SVT_MIMETYPE_TEXT_VCALENDAR     (STR_SVT_MIMETYPE_START+95)
-#define STR_SVT_MIMETYPE_TEXT_ICALENDAR     (STR_SVT_MIMETYPE_START+96)
-#define STR_SVT_MIMETYPE_TEXT_XMLICALENDAR  (STR_SVT_MIMETYPE_START+97)
-#define STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP  (STR_SVT_MIMETYPE_START+98)
-#define STR_SVT_MIMETYPE_INET_MSG_RFC822        (STR_SVT_MIMETYPE_START+99)
-#define STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE (STR_SVT_MIMETYPE_START+100)
-#define STR_SVT_MIMETYPE_INET_MULTI_DIGEST      (STR_SVT_MIMETYPE_START+101)
-#define STR_SVT_MIMETYPE_INET_MULTI_PARALLEL    (STR_SVT_MIMETYPE_START+102)
-#define STR_SVT_MIMETYPE_INET_MULTI_RELATED     (STR_SVT_MIMETYPE_START+103)
-#define STR_SVT_MIMETYPE_INET_MULTI_MIXED       (STR_SVT_MIMETYPE_START+104)
-#define STR_SVT_MIMETYPE_APP_IMPRESSPACKED      (STR_SVT_MIMETYPE_START+105)
-#define STR_SVT_MIMETYPE_APP_JAR                (STR_SVT_MIMETYPE_START+106)
-#define STR_SVT_MIMETYPE_IMAGE_PNG              (STR_SVT_MIMETYPE_START+107)
-#define STR_SVT_MIMETYPE_IMAGE_TIFF             (STR_SVT_MIMETYPE_START+108)
+#define STR_SVT_MIMETYPE_CNT_FSYSBOX        (STR_SVT_MIMETYPE_START+35)
+#define STR_SVT_MIMETYPE_CNT_FSYSFLD        (STR_SVT_MIMETYPE_START+36)
+#define STR_SVT_MIMETYPE_APP_GAL            (STR_SVT_MIMETYPE_START+37)
+#define STR_SVT_MIMETYPE_APP_GAL_THEME      (STR_SVT_MIMETYPE_START+38)
+#define STR_SVT_MIMETYPE_APP_STARW_GLOB     (STR_SVT_MIMETYPE_START+39)
+#define STR_SVT_MIMETYPE_APP_SDM            (STR_SVT_MIMETYPE_START+40)
+#define STR_SVT_MIMETYPE_APP_SMD            (STR_SVT_MIMETYPE_START+41)
+#define STR_SVT_MIMETYPE_APP_STARW_WEB      (STR_SVT_MIMETYPE_START+42)
+#define STR_SVT_MIMETYPE_SCHEDULE           (STR_SVT_MIMETYPE_START+43)
+#define STR_SVT_MIMETYPE_SCHEDULE_EVT       (STR_SVT_MIMETYPE_START+44)
+#define STR_SVT_MIMETYPE_SCHEDULE_TASK      (STR_SVT_MIMETYPE_START+45)
+#define STR_SVT_MIMETYPE_SCHEDULE_FEVT      (STR_SVT_MIMETYPE_START+46)
+#define STR_SVT_MIMETYPE_SCHEDULE_FTASK     (STR_SVT_MIMETYPE_START+47)
+#define STR_SVT_MIMETYPE_FRAMESET           (STR_SVT_MIMETYPE_START+48)
+#define STR_SVT_MIMETYPE_MACRO              (STR_SVT_MIMETYPE_START+49)
+#define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER    (STR_SVT_MIMETYPE_START+50)
+#define STR_SVT_MIMETYPE_APP_TEMPLATE       (STR_SVT_MIMETYPE_START+51)
+#define STR_SVT_MIMETYPE_IMAGE_GENERIC      (STR_SVT_MIMETYPE_START+52)
+#define STR_SVT_MIMETYPE_APP_MSEXCEL        (STR_SVT_MIMETYPE_START+53)
+#define STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL  (STR_SVT_MIMETYPE_START+54)
+#define STR_SVT_MIMETYPE_APP_MSPPOINT       (STR_SVT_MIMETYPE_START+55)
+#define STR_SVT_MIMETYPE_TEXT_VCALENDAR     (STR_SVT_MIMETYPE_START+56)
+#define STR_SVT_MIMETYPE_TEXT_ICALENDAR     (STR_SVT_MIMETYPE_START+57)
+#define STR_SVT_MIMETYPE_TEXT_XMLICALENDAR  (STR_SVT_MIMETYPE_START+58)
+#define STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP  (STR_SVT_MIMETYPE_START+59)
+#define STR_SVT_MIMETYPE_INET_MSG_RFC822        (STR_SVT_MIMETYPE_START+60)
+#define STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE (STR_SVT_MIMETYPE_START+61)
+#define STR_SVT_MIMETYPE_INET_MULTI_DIGEST      (STR_SVT_MIMETYPE_START+62)
+#define STR_SVT_MIMETYPE_INET_MULTI_PARALLEL    (STR_SVT_MIMETYPE_START+63)
+#define STR_SVT_MIMETYPE_INET_MULTI_RELATED     (STR_SVT_MIMETYPE_START+64)
+#define STR_SVT_MIMETYPE_INET_MULTI_MIXED       (STR_SVT_MIMETYPE_START+65)
+#define STR_SVT_MIMETYPE_APP_IMPRESSPACKED      (STR_SVT_MIMETYPE_START+66)
+#define STR_SVT_MIMETYPE_APP_JAR                (STR_SVT_MIMETYPE_START+67)
+#define STR_SVT_MIMETYPE_IMAGE_PNG              (STR_SVT_MIMETYPE_START+68)
+#define STR_SVT_MIMETYPE_IMAGE_TIFF             (STR_SVT_MIMETYPE_START+69)
 
-#define STR_SVT_MIMETYPE_APP_SXCALC         (STR_SVT_MIMETYPE_START+109)
-#define STR_SVT_MIMETYPE_APP_SXCHART        (STR_SVT_MIMETYPE_START+110)
-#define STR_SVT_MIMETYPE_APP_SXDRAW         (STR_SVT_MIMETYPE_START+111)
-#define STR_SVT_MIMETYPE_APP_SXMATH         (STR_SVT_MIMETYPE_START+112)
-#define STR_SVT_MIMETYPE_APP_SXWRITER       (STR_SVT_MIMETYPE_START+113)
-#define STR_SVT_MIMETYPE_APP_SXIMPRESS      (STR_SVT_MIMETYPE_START+114)
-#define STR_SVT_MIMETYPE_APP_SXGLOBAL       (STR_SVT_MIMETYPE_START+115)
-#define STR_SVT_MIMETYPE_APP_SXIPACKED      (STR_SVT_MIMETYPE_START+116)
+#define STR_SVT_MIMETYPE_APP_SXCALC         (STR_SVT_MIMETYPE_START+70)
+#define STR_SVT_MIMETYPE_APP_SXCHART        (STR_SVT_MIMETYPE_START+71)
+#define STR_SVT_MIMETYPE_APP_SXDRAW         (STR_SVT_MIMETYPE_START+72)
+#define STR_SVT_MIMETYPE_APP_SXMATH         (STR_SVT_MIMETYPE_START+73)
+#define STR_SVT_MIMETYPE_APP_SXWRITER       (STR_SVT_MIMETYPE_START+74)
+#define STR_SVT_MIMETYPE_APP_SXIMPRESS      (STR_SVT_MIMETYPE_START+75)
+#define STR_SVT_MIMETYPE_APP_SXGLOBAL       (STR_SVT_MIMETYPE_START+76)
+#define STR_SVT_MIMETYPE_APP_SXIPACKED      (STR_SVT_MIMETYPE_START+77)
 
 
-#define STR_SVT_MIMETYPE_VIDEO_WEBM         (STR_SVT_MIMETYPE_START+117)
-#define STR_SVT_MIMETYPE_AUDIO_WEBM         (STR_SVT_MIMETYPE_START+118)
+#define STR_SVT_MIMETYPE_VIDEO_WEBM         (STR_SVT_MIMETYPE_START+78)
+#define STR_SVT_MIMETYPE_AUDIO_WEBM         (STR_SVT_MIMETYPE_START+79)
 
 #define STR_SVT_MIMETYPE_END                (STR_SVT_MIMETYPE_AUDIO_WEBM)
 
commit 45e5cdd99f11834039d77adc2b8a13b20a5a0028
Author: Lior Kaplan <kaplanlior at gmail.com>
Date:   Mon Oct 17 20:35:07 2011 +0200

    Remove .chaos file types, except 3 which are in use in the code

diff --git a/svl/inc/svl/inettype.hxx b/svl/inc/svl/inettype.hxx
index f88373d..d972872 100644
--- a/svl/inc/svl/inettype.hxx
+++ b/svl/inc/svl/inettype.hxx
@@ -94,50 +94,9 @@
 #define CONTENT_TYPE_STR_AUDIO_VORBIS "audio/vorbis"
 #define CONTENT_TYPE_STR_AUDIO_WAV "audio/wav"
 #define CONTENT_TYPE_STR_AUDIO_WEBM "audio/webm"
-#define CONTENT_TYPE_STR_X_CNT_DOCUMENT ".chaos/document"
 #define CONTENT_TYPE_STR_X_CNT_FSYSBOX ".chaos/fsys-box"
-#define CONTENT_TYPE_STR_X_CNT_CDROM_VOLUME ".chaos/fsys-cdrom-volume"
-#define CONTENT_TYPE_STR_X_CNT_DISK_35 ".chaos/fsys-disk-35"
-#define CONTENT_TYPE_STR_X_CNT_DISK_525 ".chaos/fsys-disk-525"
-#define CONTENT_TYPE_STR_X_CNT_FSYSFILE ".chaos/fsys-file"
-#define CONTENT_TYPE_STR_X_CNT_FIXED_VOLUME ".chaos/fsys-fixed-volume"
 #define CONTENT_TYPE_STR_X_CNT_FSYSFOLDER ".chaos/fsys-folder"
-#define CONTENT_TYPE_STR_X_CNT_RAM_VOLUME ".chaos/fsys-ram-volume"
-#define CONTENT_TYPE_STR_X_CNT_REMOTE_VOLUME ".chaos/fsys-remote-volume"
-#define CONTENT_TYPE_STR_X_CNT_REMOVEABLE_VOLUME \
-    ".chaos/fsys-removeable-volume"
-#define CONTENT_TYPE_STR_X_CNT_FSYSSPECIALFILE ".chaos/fsys-special-file"
 #define CONTENT_TYPE_STR_X_CNT_FSYSSPECIALFOLDER ".chaos/fsys-special-folder"
-#define CONTENT_TYPE_STR_X_CNT_TAPEDRIVE ".chaos/fsys-tapedrive"
-#define CONTENT_TYPE_STR_X_CNT_FSYSURLFILE ".chaos/fsys-urlfile"
-#define CONTENT_TYPE_STR_X_CNT_FTPBOX ".chaos/ftp-box"
-#define CONTENT_TYPE_STR_X_CNT_FTPFILE ".chaos/ftp-file"
-#define CONTENT_TYPE_STR_X_CNT_FTPFOLDER ".chaos/ftp-folder"
-#define CONTENT_TYPE_STR_X_CNT_FTPLINK ".chaos/ftp-link"
-#define CONTENT_TYPE_STR_X_CNT_HTTPBOX ".chaos/http-box"
-#define CONTENT_TYPE_STR_X_CNT_HTTPFILE ".chaos/http-file"
-#define CONTENT_TYPE_STR_X_CNT_IMAPBOX ".chaos/imap-box"
-#define CONTENT_TYPE_STR_X_CNT_IMAPFOLDER ".chaos/imap-folder"
-#define CONTENT_TYPE_STR_X_CNT_MESSAGE ".chaos/message"
-#define CONTENT_TYPE_STR_X_CNT_NEWSBOX ".chaos/news-box"
-#define CONTENT_TYPE_STR_X_CNT_NEWSGROUP ".chaos/news-group"
-#define CONTENT_TYPE_STR_X_CNT_OUTBOX ".chaos/out-box"
-#define CONTENT_TYPE_STR_X_CNT_POP3BOX ".chaos/pop3-box"
-#define CONTENT_TYPE_STR_X_CNT_PUBLISHBOX ".chaos/publish-box"
-#define CONTENT_TYPE_STR_X_CNT_SEARCHBOX ".chaos/search-box"
-#define CONTENT_TYPE_STR_X_CNT_SEPARATOR ".chaos/separator"
-#define CONTENT_TYPE_STR_X_CNT_BOOKMARK ".chaos/subscribe-bookmark"
-#define CONTENT_TYPE_STR_X_CNT_SUBSCRIBEBOX ".chaos/subscribe-box"
-#define CONTENT_TYPE_STR_X_CNT_CDFITEM ".chaos/subscribe-cdf-item"
-#define CONTENT_TYPE_STR_X_CNT_CDFSUB ".chaos/subscribe-cdf-sub"
-#define CONTENT_TYPE_STR_X_CNT_CDF ".chaos/subscribe-cdf"
-#define CONTENT_TYPE_STR_X_CNT_STARCHANNEL ".chaos/subscribe-sdc"
-#define CONTENT_TYPE_STR_X_CNT_TRASHBOX ".chaos/trash-box"
-#define CONTENT_TYPE_STR_X_CNT_TRASH ".chaos/trash-item"
-#define CONTENT_TYPE_STR_X_CNT_VIMBBOARDBOX ".chaos/vim-bboardbox"
-#define CONTENT_TYPE_STR_X_CNT_VIMBBOARD ".chaos/vim-bboard"
-#define CONTENT_TYPE_STR_X_CNT_VIMBOX ".chaos/vim-box"
-#define CONTENT_TYPE_STR_X_CNT_VIMINBOX ".chaos/vim-inbox"
 #define CONTENT_TYPE_STR_IMAGE_GENERIC "image/generic"
 #define CONTENT_TYPE_STR_IMAGE_GIF "image/gif"
 #define CONTENT_TYPE_STR_IMAGE_JPEG "image/jpeg"
@@ -250,50 +209,12 @@ enum INetContentType
     CONTENT_TYPE_VIDEO_THEORA,
     CONTENT_TYPE_VIDEO_VDO,
     CONTENT_TYPE_VIDEO_WEBM,
-    CONTENT_TYPE_X_CNT_MESSAGE,
-    CONTENT_TYPE_X_CNT_DOCUMENT,
-    CONTENT_TYPE_X_CNT_POP3BOX,
-    CONTENT_TYPE_X_CNT_IMAPBOX,
-    CONTENT_TYPE_X_CNT_IMAPFOLDER,
-    CONTENT_TYPE_X_CNT_VIMBOX,
-    CONTENT_TYPE_X_CNT_VIMINBOX,
-    CONTENT_TYPE_X_CNT_VIMBBOARDBOX,
-    CONTENT_TYPE_X_CNT_VIMBBOARD,
-    CONTENT_TYPE_X_CNT_NEWSBOX,
-    CONTENT_TYPE_X_CNT_NEWSGROUP,
-    CONTENT_TYPE_X_CNT_OUTBOX,
-    CONTENT_TYPE_X_CNT_FTPBOX,
-    CONTENT_TYPE_X_CNT_FTPFOLDER,
-    CONTENT_TYPE_X_CNT_FTPFILE,
-    CONTENT_TYPE_X_CNT_FTPLINK,
-    CONTENT_TYPE_X_CNT_HTTPBOX,
     CONTENT_TYPE_X_CNT_FSYSBOX,
     CONTENT_TYPE_X_CNT_FSYSFOLDER,
-    CONTENT_TYPE_X_CNT_FSYSFILE,
-    CONTENT_TYPE_X_CNT_FSYSURLFILE,
-    CONTENT_TYPE_X_CNT_PUBLISHBOX,
-    CONTENT_TYPE_X_CNT_SEARCHBOX,
-    CONTENT_TYPE_X_CNT_SUBSCRIBEBOX,
-    CONTENT_TYPE_X_CNT_BOOKMARK,
-    CONTENT_TYPE_X_CNT_CDF,
-    CONTENT_TYPE_X_CNT_CDFSUB,
-    CONTENT_TYPE_X_CNT_CDFITEM,
-    CONTENT_TYPE_X_CNT_TRASHBOX,
-    CONTENT_TYPE_X_CNT_TRASH,
     CONTENT_TYPE_X_STARMAIL,
     CONTENT_TYPE_X_VRML,
-    CONTENT_TYPE_X_CNT_REMOVEABLE_VOLUME,
-    CONTENT_TYPE_X_CNT_FIXED_VOLUME,
-    CONTENT_TYPE_X_CNT_REMOTE_VOLUME,
-    CONTENT_TYPE_X_CNT_RAM_VOLUME,
-    CONTENT_TYPE_X_CNT_CDROM_VOLUME,
-    CONTENT_TYPE_X_CNT_DISK_35,
-    CONTENT_TYPE_X_CNT_DISK_525,
-    CONTENT_TYPE_X_CNT_TAPEDRIVE,
     CONTENT_TYPE_APP_GALLERY,
     CONTENT_TYPE_APP_GALLERY_THEME,
-    CONTENT_TYPE_X_CNT_STARCHANNEL,
-    CONTENT_TYPE_X_CNT_SEPARATOR,
     CONTENT_TYPE_APP_STARWRITER_GLOB,
     CONTENT_TYPE_APP_STARMAIL_SDM,
     CONTENT_TYPE_APP_STARMAIL_SMD,
@@ -315,12 +236,10 @@ enum INetContentType
     CONTENT_TYPE_APP_FRAMESET,
     CONTENT_TYPE_APP_MACRO,
     CONTENT_TYPE_X_CNT_FSYSSPECIALFOLDER,
-    CONTENT_TYPE_X_CNT_FSYSSPECIALFILE,
     CONTENT_TYPE_APP_VND_TEMPLATE,
     CONTENT_TYPE_IMAGE_GENERIC,
     CONTENT_TYPE_APP_VND_NEWS,
     CONTENT_TYPE_APP_VND_OUTTRAY,
-    CONTENT_TYPE_X_CNT_HTTPFILE,
     CONTENT_TYPE_APP_MSEXCEL,
     CONTENT_TYPE_APP_MSEXCEL_TEMPL,
     CONTENT_TYPE_APP_MSPPOINT,
diff --git a/svl/inc/svl/svl.hrc b/svl/inc/svl/svl.hrc
index 599e645..1bc3cde 100644
--- a/svl/inc/svl/svl.hrc
+++ b/svl/inc/svl/svl.hrc
@@ -66,48 +66,48 @@
 #define STR_SVT_MIMETYPE_APP_SCHED_TASK     (STR_SVT_MIMETYPE_START+33)
 #define STR_SVT_MIMETYPE_APP_SCHED_TVIEW    (STR_SVT_MIMETYPE_START+34)
 
-#define STR_SVT_MIMETYPE_CNT_MSG            (STR_SVT_MIMETYPE_START+35)
-#define STR_SVT_MIMETYPE_CNT_DOCUMENT       (STR_SVT_MIMETYPE_START+36)
-#define STR_SVT_MIMETYPE_CNT_POP3BOX        (STR_SVT_MIMETYPE_START+37)
-#define STR_SVT_MIMETYPE_CNT_IMAPBOX        (STR_SVT_MIMETYPE_START+38)
-#define STR_SVT_MIMETYPE_CNT_IMAPFLD        (STR_SVT_MIMETYPE_START+39)
-#define STR_SVT_MIMETYPE_CNT_VIMBOX         (STR_SVT_MIMETYPE_START+40)
-#define STR_SVT_MIMETYPE_CNT_VIMINBOX       (STR_SVT_MIMETYPE_START+41)
-#define STR_SVT_MIMETYPE_CNT_BBBOX          (STR_SVT_MIMETYPE_START+42)
-#define STR_SVT_MIMETYPE_CNT_VIM_BB         (STR_SVT_MIMETYPE_START+43)
-#define STR_SVT_MIMETYPE_CNT_NEWSBOX        (STR_SVT_MIMETYPE_START+44)
-#define STR_SVT_MIMETYPE_CNT_NEWSGRP        (STR_SVT_MIMETYPE_START+45)
-#define STR_SVT_MIMETYPE_CNT_OUTBOX         (STR_SVT_MIMETYPE_START+46)
-#define STR_SVT_MIMETYPE_CNT_FTPBOX         (STR_SVT_MIMETYPE_START+47)
-#define STR_SVT_MIMETYPE_CNT_FTPFLD         (STR_SVT_MIMETYPE_START+48)
-#define STR_SVT_MIMETYPE_CNT_FTPFILE        (STR_SVT_MIMETYPE_START+49)
-#define STR_SVT_MIMETYPE_CNT_FTPLINK        (STR_SVT_MIMETYPE_START+50)
-#define STR_SVT_MIMETYPE_CNT_HTTPBOX        (STR_SVT_MIMETYPE_START+51)
+(STR_SVT_MIMETYPE_START+35)
+(STR_SVT_MIMETYPE_START+36)
+(STR_SVT_MIMETYPE_START+37)
+(STR_SVT_MIMETYPE_START+38)
+(STR_SVT_MIMETYPE_START+39)
+(STR_SVT_MIMETYPE_START+40)
+(STR_SVT_MIMETYPE_START+41)
+(STR_SVT_MIMETYPE_START+42)
+(STR_SVT_MIMETYPE_START+43)
+(STR_SVT_MIMETYPE_START+44)
+(STR_SVT_MIMETYPE_START+45)
+(STR_SVT_MIMETYPE_START+46)
+(STR_SVT_MIMETYPE_START+47)
+(STR_SVT_MIMETYPE_START+48)
+(STR_SVT_MIMETYPE_START+49)
+(STR_SVT_MIMETYPE_START+50)
+(STR_SVT_MIMETYPE_START+51)
 #define STR_SVT_MIMETYPE_CNT_FSYSBOX        (STR_SVT_MIMETYPE_START+52)
 #define STR_SVT_MIMETYPE_CNT_FSYSFLD        (STR_SVT_MIMETYPE_START+53)
-#define STR_SVT_MIMETYPE_CNT_FSYSFILE       (STR_SVT_MIMETYPE_START+54)
-#define STR_SVT_MIMETYPE_CNT_FSYSURLFILE    (STR_SVT_MIMETYPE_START+55)
-#define STR_SVT_MIMETYPE_CNT_PUBLBOX        (STR_SVT_MIMETYPE_START+56)
-#define STR_SVT_MIMETYPE_CNT_SRCHBOX        (STR_SVT_MIMETYPE_START+57)
-#define STR_SVT_MIMETYPE_CNT_SUBSCRBOX      (STR_SVT_MIMETYPE_START+58)
-#define STR_SVT_MIMETYPE_CNT_BOOKMARK       (STR_SVT_MIMETYPE_START+59)
-#define STR_SVT_MIMETYPE_CNT_CDF            (STR_SVT_MIMETYPE_START+60)
-#define STR_SVT_MIMETYPE_CNT_CDFSUB         (STR_SVT_MIMETYPE_START+61)
-#define STR_SVT_MIMETYPE_CNT_CDFITEM        (STR_SVT_MIMETYPE_START+62)
-#define STR_SVT_MIMETYPE_CNT_STARCHANNEL    (STR_SVT_MIMETYPE_START+63)
-#define STR_SVT_MIMETYPE_CNT_TRASHBOX       (STR_SVT_MIMETYPE_START+64)
-#define STR_SVT_MIMETYPE_CNT_TRASH          (STR_SVT_MIMETYPE_START+65)
-#define STR_SVT_MIMETYPE_CNT_REMOV_VOL      (STR_SVT_MIMETYPE_START+66)
-#define STR_SVT_MIMETYPE_CNT_FIX_VOL        (STR_SVT_MIMETYPE_START+67)
-#define STR_SVT_MIMETYPE_CNT_REM_VOL        (STR_SVT_MIMETYPE_START+68)
-#define STR_SVT_MIMETYPE_CNT_RAM_VOL        (STR_SVT_MIMETYPE_START+69)
-#define STR_SVT_MIMETYPE_CNT_CDROM          (STR_SVT_MIMETYPE_START+70)
-#define STR_SVT_MIMETYPE_CNT_DISK_35        (STR_SVT_MIMETYPE_START+71)
-#define STR_SVT_MIMETYPE_CNT_DISK_525       (STR_SVT_MIMETYPE_START+72)
-#define STR_SVT_MIMETYPE_CNT_TAPEDRIVE      (STR_SVT_MIMETYPE_START+73)
+(STR_SVT_MIMETYPE_START+54)
+(STR_SVT_MIMETYPE_START+55)
+(STR_SVT_MIMETYPE_START+56)
+(STR_SVT_MIMETYPE_START+57)
+(STR_SVT_MIMETYPE_START+58)
+(STR_SVT_MIMETYPE_START+59)
+(STR_SVT_MIMETYPE_START+60)
+(STR_SVT_MIMETYPE_START+61)
+(STR_SVT_MIMETYPE_START+62)
+(STR_SVT_MIMETYPE_START+63)
+(STR_SVT_MIMETYPE_START+64)
+(STR_SVT_MIMETYPE_START+65)
+(STR_SVT_MIMETYPE_START+66)
+(STR_SVT_MIMETYPE_START+67)
+(STR_SVT_MIMETYPE_START+68)
+(STR_SVT_MIMETYPE_START+69)
+(STR_SVT_MIMETYPE_START+70)
+(STR_SVT_MIMETYPE_START+71)
+(STR_SVT_MIMETYPE_START+72)
+(STR_SVT_MIMETYPE_START+73)
 #define STR_SVT_MIMETYPE_APP_GAL            (STR_SVT_MIMETYPE_START+74)
 #define STR_SVT_MIMETYPE_APP_GAL_THEME      (STR_SVT_MIMETYPE_START+75)
-#define STR_SVT_MIMETYPE_CNT_SEPARATOR      (STR_SVT_MIMETYPE_START+76)
+(STR_SVT_MIMETYPE_START+76)
 #define STR_SVT_MIMETYPE_APP_STARW_GLOB     (STR_SVT_MIMETYPE_START+77)
 #define STR_SVT_MIMETYPE_APP_SDM            (STR_SVT_MIMETYPE_START+78)
 #define STR_SVT_MIMETYPE_APP_SMD            (STR_SVT_MIMETYPE_START+79)
@@ -120,7 +120,7 @@
 #define STR_SVT_MIMETYPE_FRAMESET           (STR_SVT_MIMETYPE_START+86)
 #define STR_SVT_MIMETYPE_MACRO              (STR_SVT_MIMETYPE_START+87)
 #define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER    (STR_SVT_MIMETYPE_START+88)
-#define STR_SVT_MIMETYPE_CNT_SFSYSFILE      (STR_SVT_MIMETYPE_START+89)
+(STR_SVT_MIMETYPE_START+89)
 #define STR_SVT_MIMETYPE_APP_TEMPLATE       (STR_SVT_MIMETYPE_START+90)
 #define STR_SVT_MIMETYPE_IMAGE_GENERIC      (STR_SVT_MIMETYPE_START+91)
 #define STR_SVT_MIMETYPE_APP_MSEXCEL        (STR_SVT_MIMETYPE_START+92)
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index 1a75aba..9a752c7 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -145,76 +145,11 @@ MediaTypeEntry const * seekEntry(UniString const & rTypeName,
  */
 MediaTypeEntry const aStaticTypeNameMap[CONTENT_TYPE_LAST + 1]
     = { { " ", CONTENT_TYPE_UNKNOWN, "" },
-        { CONTENT_TYPE_STR_X_CNT_DOCUMENT, CONTENT_TYPE_X_CNT_DOCUMENT,
-          "tmp" },
         { CONTENT_TYPE_STR_X_CNT_FSYSBOX, CONTENT_TYPE_X_CNT_FSYSBOX, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_CDROM_VOLUME,
-          CONTENT_TYPE_X_CNT_CDROM_VOLUME, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_DISK_35, CONTENT_TYPE_X_CNT_DISK_35, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_DISK_525, CONTENT_TYPE_X_CNT_DISK_525,
-          "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_FSYSFILE, CONTENT_TYPE_X_CNT_FSYSFILE,
-          "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_FIXED_VOLUME,
-          CONTENT_TYPE_X_CNT_FIXED_VOLUME, "tmp" },
         { CONTENT_TYPE_STR_X_CNT_FSYSFOLDER, CONTENT_TYPE_X_CNT_FSYSFOLDER,
           "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_RAM_VOLUME, CONTENT_TYPE_X_CNT_RAM_VOLUME,
-          "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_REMOTE_VOLUME,
-          CONTENT_TYPE_X_CNT_REMOTE_VOLUME, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_REMOVEABLE_VOLUME,
-          CONTENT_TYPE_X_CNT_REMOVEABLE_VOLUME, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_FSYSSPECIALFILE,
-          CONTENT_TYPE_X_CNT_FSYSSPECIALFILE, "tmp" },
         { CONTENT_TYPE_STR_X_CNT_FSYSSPECIALFOLDER,
           CONTENT_TYPE_X_CNT_FSYSSPECIALFOLDER, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_TAPEDRIVE, CONTENT_TYPE_X_CNT_TAPEDRIVE,
-          "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_FSYSURLFILE, CONTENT_TYPE_X_CNT_FSYSURLFILE,
-          "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_FTPBOX, CONTENT_TYPE_X_CNT_FTPBOX, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_FTPFILE, CONTENT_TYPE_X_CNT_FTPFILE, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_FTPFOLDER, CONTENT_TYPE_X_CNT_FTPFOLDER,
-          "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_FTPLINK, CONTENT_TYPE_X_CNT_FTPLINK, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_HTTPBOX, CONTENT_TYPE_X_CNT_HTTPBOX, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_HTTPFILE, CONTENT_TYPE_X_CNT_HTTPFILE,
-          "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_IMAPBOX, CONTENT_TYPE_X_CNT_IMAPBOX, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_IMAPFOLDER, CONTENT_TYPE_X_CNT_IMAPFOLDER,
-          "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_MESSAGE, CONTENT_TYPE_X_CNT_MESSAGE, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_NEWSBOX, CONTENT_TYPE_X_CNT_NEWSBOX, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_NEWSGROUP, CONTENT_TYPE_X_CNT_NEWSGROUP,
-          "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_OUTBOX, CONTENT_TYPE_X_CNT_OUTBOX, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_POP3BOX, CONTENT_TYPE_X_CNT_POP3BOX, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_PUBLISHBOX, CONTENT_TYPE_X_CNT_PUBLISHBOX,
-          "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_SEARCHBOX, CONTENT_TYPE_X_CNT_SEARCHBOX,
-          "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_SEPARATOR, CONTENT_TYPE_X_CNT_SEPARATOR,
-          "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_BOOKMARK, CONTENT_TYPE_X_CNT_BOOKMARK,
-          "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_SUBSCRIBEBOX,
-          CONTENT_TYPE_X_CNT_SUBSCRIBEBOX, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_CDF, CONTENT_TYPE_X_CNT_CDF, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_CDFITEM, CONTENT_TYPE_X_CNT_CDFITEM, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_CDFSUB, CONTENT_TYPE_X_CNT_CDFSUB, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_STARCHANNEL, CONTENT_TYPE_X_CNT_STARCHANNEL,
-          "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_TRASHBOX, CONTENT_TYPE_X_CNT_TRASHBOX,
-          "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_TRASH, CONTENT_TYPE_X_CNT_TRASH, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_VIMBBOARD, CONTENT_TYPE_X_CNT_VIMBBOARD,
-          "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_VIMBBOARDBOX,
-          CONTENT_TYPE_X_CNT_VIMBBOARDBOX, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_VIMBOX, CONTENT_TYPE_X_CNT_VIMBOX, "tmp" },
-        { CONTENT_TYPE_STR_X_CNT_VIMINBOX, CONTENT_TYPE_X_CNT_VIMINBOX,
-          "tmp" },
         { CONTENT_TYPE_STR_APP_OCTSTREAM, CONTENT_TYPE_APP_OCTSTREAM, "tmp" },
         { CONTENT_TYPE_STR_APP_PDF, CONTENT_TYPE_APP_PDF, "pdf" },
         { CONTENT_TYPE_STR_APP_RTF, CONTENT_TYPE_APP_RTF, "rtf" },
@@ -373,51 +308,12 @@ sal_uInt16 const aStaticResourceIDMap[CONTENT_TYPE_LAST + 1]
         STR_SVT_MIMETYPE_VIDEO_THEORA, // CONTENT_TYPE_VIDEO_THEORA
         STR_SVT_MIMETYPE_VIDEO_VDO, // CONTENT_TYPE_VIDEO_VDO
         STR_SVT_MIMETYPE_VIDEO_WEBM, // CONTENT_TYPE_VIDEO_WEBM
-        STR_SVT_MIMETYPE_CNT_MSG, // CONTENT_TYPE_X_CNT_MESSAGE
-        STR_SVT_MIMETYPE_CNT_DOCUMENT, // CONTENT_TYPE_X_CNT_DOCUMENT
-        STR_SVT_MIMETYPE_CNT_POP3BOX, // CONTENT_TYPE_X_CNT_POP3BOX
-        STR_SVT_MIMETYPE_CNT_IMAPBOX, // CONTENT_TYPE_X_CNT_IMAPBOX
-        STR_SVT_MIMETYPE_CNT_IMAPFLD, // CONTENT_TYPE_X_CNT_IMAPFOLDER
-        STR_SVT_MIMETYPE_CNT_VIMBOX, // CONTENT_TYPE_X_CNT_VIMBOX
-        STR_SVT_MIMETYPE_CNT_VIMINBOX, // CONTENT_TYPE_X_CNT_VIMINBOX
-        STR_SVT_MIMETYPE_CNT_BBBOX, // CONTENT_TYPE_X_CNT_VIMBBOARDBOX
-        STR_SVT_MIMETYPE_CNT_VIM_BB, // CONTENT_TYPE_X_CNT_VIMBBOARD
-        STR_SVT_MIMETYPE_CNT_NEWSBOX, // CONTENT_TYPE_X_CNT_NEWSBOX
-        STR_SVT_MIMETYPE_CNT_NEWSGRP, // CONTENT_TYPE_X_CNT_NEWSGROUP
-        STR_SVT_MIMETYPE_CNT_OUTBOX, // CONTENT_TYPE_X_CNT_OUTBOX
-        STR_SVT_MIMETYPE_CNT_FTPBOX, // CONTENT_TYPE_X_CNT_FTPBOX
-        STR_SVT_MIMETYPE_CNT_FTPFLD, // CONTENT_TYPE_X_CNT_FTPFOLDER
-        STR_SVT_MIMETYPE_CNT_FTPFILE, // CONTENT_TYPE_X_CNT_FTPFILE
-        STR_SVT_MIMETYPE_CNT_FTPLINK, // CONTENT_TYPE_X_CNT_FTPLINK
-        STR_SVT_MIMETYPE_CNT_HTTPBOX, // CONTENT_TYPE_X_CNT_HTTPBOX
         STR_SVT_MIMETYPE_CNT_FSYSBOX, // CONTENT_TYPE_X_CNT_FSYSBOX
         STR_SVT_MIMETYPE_CNT_FSYSFLD, // CONTENT_TYPE_X_CNT_FSYSFOLDER
-        STR_SVT_MIMETYPE_CNT_FSYSFILE, // CONTENT_TYPE_X_CNT_FSYSFILE
-        STR_SVT_MIMETYPE_CNT_FSYSURLFILE, // CONTENT_TYPE_X_CNT_FSYSURLFILE
-        STR_SVT_MIMETYPE_CNT_PUBLBOX, // CONTENT_TYPE_X_CNT_PUBLISHBOX
-        STR_SVT_MIMETYPE_CNT_SRCHBOX, // CONTENT_TYPE_X_CNT_SEARCHBOX
-        STR_SVT_MIMETYPE_CNT_SUBSCRBOX, // CONTENT_TYPE_X_CNT_SUBSCRIBEBOX
-        STR_SVT_MIMETYPE_CNT_BOOKMARK, // CONTENT_TYPE_X_CNT_BOOKMARK
-        STR_SVT_MIMETYPE_CNT_CDF, // CONTENT_TYPE_X_CNT_CDF
-        STR_SVT_MIMETYPE_CNT_CDFSUB, // CONTENT_TYPE_X_CNT_CDFSUB
-        STR_SVT_MIMETYPE_CNT_CDFITEM, // CONTENT_TYPE_X_CNT_CDFITEM
-        STR_SVT_MIMETYPE_CNT_TRASHBOX, // CONTENT_TYPE_X_CNT_TRASHBOX
-        STR_SVT_MIMETYPE_CNT_TRASH, // CONTENT_TYPE_X_CNT_TRASH
         STR_SVT_MIMETYPE_X_STARMAIL, // CONTENT_TYPE_X_STARMAIL
         STR_SVT_MIMETYPE_X_VRML, // CONTENT_TYPE_X_VRML
-        STR_SVT_MIMETYPE_CNT_REMOV_VOL,
-            // CONTENT_TYPE_X_CNT_REMOVEABLE_VOLUME
-        STR_SVT_MIMETYPE_CNT_FIX_VOL, // CONTENT_TYPE_X_CNT_FIXED_VOLUME
-        STR_SVT_MIMETYPE_CNT_REM_VOL, // CONTENT_TYPE_X_CNT_REMOTE_VOLUME
-        STR_SVT_MIMETYPE_CNT_RAM_VOL, // CONTENT_TYPE_X_CNT_RAM_VOLUME
-        STR_SVT_MIMETYPE_CNT_CDROM, // CONTENT_TYPE_X_CNT_CDROM_VOLUME
-        STR_SVT_MIMETYPE_CNT_DISK_35, // CONTENT_TYPE_X_CNT_DISK_35
-        STR_SVT_MIMETYPE_CNT_DISK_525, // CONTENT_TYPE_X_CNT_DISK_525
-        STR_SVT_MIMETYPE_CNT_TAPEDRIVE, // CONTENT_TYPE_X_CNT_TAPEDRIVE
         STR_SVT_MIMETYPE_APP_GAL, // CONTENT_TYPE_APP_GALLERY
         STR_SVT_MIMETYPE_APP_GAL_THEME, // CONTENT_TYPE_APP_GALLERY_THEME
-        STR_SVT_MIMETYPE_CNT_STARCHANNEL, // CONTENT_TYPE_X_CNT_STARCHANNEL
-        STR_SVT_MIMETYPE_CNT_SEPARATOR, // CONTENT_TYPE_X_CNT_SEPARATOR
         STR_SVT_MIMETYPE_APP_STARW_GLOB, // CONTENT_TYPE_APP_STARWRITER_GLOB
         STR_SVT_MIMETYPE_APP_SDM, // CONTENT_TYPE_APP_STARMAIL_SDM
         STR_SVT_MIMETYPE_APP_SMD, // CONTENT_TYPE_APP_STARMAIL_SMD
@@ -441,12 +337,10 @@ sal_uInt16 const aStaticResourceIDMap[CONTENT_TYPE_LAST + 1]
         STR_SVT_MIMETYPE_MACRO, // CONTENT_TYPE_APP_MACRO
         STR_SVT_MIMETYPE_CNT_SFSYSFOLDER,
             // CONTENT_TYPE_X_CNT_FSYSSPECIALFOLDER
-        STR_SVT_MIMETYPE_CNT_SFSYSFILE, // CONTENT_TYPE_X_CNT_FSYSSPECIALFILE
         STR_SVT_MIMETYPE_APP_TEMPLATE, // CONTENT_TYPE_APP_VND_TEMPLATE
         STR_SVT_MIMETYPE_IMAGE_GENERIC, // CONTENT_TYPE_IMAGE_GENERIC
         STR_SVT_MIMETYPE_X_STARMAIL, // CONTENT_TYPE_APP_VND_NEWS
         STR_SVT_MIMETYPE_X_STARMAIL, // CONTENT_TYPE_APP_VND_OUTTRAY
-        STR_SVT_MIMETYPE_TEXT_HTML, // CONTENT_TYPE_X_CNT_HTTPFILE
         STR_SVT_MIMETYPE_APP_MSEXCEL, // CONTENT_TYPE_APP_MSEXCEL
         STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL, // CONTENT_TYPE_APP_MSEXCEL_TEMPL
         STR_SVT_MIMETYPE_APP_MSPPOINT, // CONTENT_TYPE_APP_MSPPOINT
diff --git a/svl/source/misc/mediatyp.src b/svl/source/misc/mediatyp.src
index 1d191c9..5704e46 100644
--- a/svl/source/misc/mediatyp.src
+++ b/svl/source/misc/mediatyp.src
@@ -209,92 +209,6 @@ String STR_SVT_MIMETYPE_APP_STARHELP
     Text [ en-US ] = "%PRODUCTNAME Help" ;
 };
 
-
-String STR_SVT_MIMETYPE_CNT_MSG
-{
-    Text [ en-US ] = "Message" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_DOCUMENT
-{
-    Text [ en-US ] = "Document" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_POP3BOX
-{
-    Text [ en-US ] = "POP3 Account" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_IMAPBOX
-{
-    Text [ en-US ] = "IMAP Account" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_IMAPFLD
-{
-    Text [ en-US ] = "Folder" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_VIMBOX
-{
-    Text [ en-US ] = "VIM Account" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_VIMINBOX
-{
-    Text [ en-US ] = "Inbox" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_BBBOX
-{
-    Text [ en-US ] = "Newsgroups" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_VIM_BB
-{
-    Text [ en-US ] = "Newsgroup" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_NEWSBOX
-{
-    Text [ en-US ] = "News" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_NEWSGRP
-{
-    Text [ en-US ] = "Group" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_OUTBOX
-{
-    Text [ en-US ] = "Outbox" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_FTPBOX
-{
-    Text [ en-US ] = "FTP Account" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_FTPFLD
-{
-    Text [ en-US ] = "FTP Folder" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_FTPFILE
-{
-    Text [ en-US ] = "FTP File" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_FTPLINK
-{
-    Text [ en-US ] = "FTP Link" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_HTTPBOX
-{
-    Text [ en-US ] = "HTTP" ;
-};
-
 String STR_SVT_MIMETYPE_CNT_FSYSBOX
 {
     Text [ en-US ] = "Workplace" ;
@@ -305,106 +219,6 @@ String STR_SVT_MIMETYPE_CNT_FSYSFLD
     Text [ en-US ] = "Folder" ;
 };
 
-String STR_SVT_MIMETYPE_CNT_FSYSFILE
-{
-    Text [ en-US ] = "File" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_FSYSURLFILE
-{
-    Text [ en-US ] = "Link" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_PUBLBOX
-{
-    Text [ en-US ] = "Project" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_SRCHBOX
-{
-    Text [ en-US ] = "Find" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_SUBSCRBOX
-{
-    Text [ en-US ] = "Subscriptions" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_BOOKMARK
-{
-    Text [ en-US ] = "Bookmark subscription" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_CDF
-{
-    Text [ en-US ] = "Channel subscription" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_CDFSUB
-{
-    Text [ en-US ] = "Channel subscription" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_CDFITEM
-{
-    Text [ en-US ] = "Channel subscription" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_STARCHANNEL
-{
-    Text [ en-US ] = "StarChannel" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_TRASHBOX
-{
-    Text [ en-US ] = "Recycle Bin" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_TRASH
-{
-    Text [ en-US ] = "Deleted Object" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_REMOV_VOL
-{
-    Text [ en-US ] = "Local drive" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_FIX_VOL
-{
-    Text [ en-US ] = "Local drive" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_REM_VOL
-{
-    Text [ en-US ] = "Network connection" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_RAM_VOL
-{
-    Text [ en-US ] = "RAM Disk" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_CDROM
-{
-    Text [ en-US ] = "CD-ROM drive" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_DISK_35
-{
-    Text [ en-US ] = "3.5'' Disk" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_DISK_525
-{
-    Text [ en-US ] = "5.25'' Disk" ;
-};
-
-String STR_SVT_MIMETYPE_CNT_TAPEDRIVE
-{
-    Text [ en-US ] = "Tape drive" ;
-};
-
 String STR_SVT_MIMETYPE_APP_GAL
 {
     Text [ en-US ] = "Gallery";
@@ -415,11 +229,6 @@ String STR_SVT_MIMETYPE_APP_GAL_THEME
     Text [ en-US ] = "Gallery theme" ;
 };
 
-String STR_SVT_MIMETYPE_CNT_SEPARATOR
-{
-    Text = "CntMenuView-Separator" ;
-};
-
 String STR_SVT_MIMETYPE_APP_STARW_GLOB
 {
     Text [ en-US ] = "%PRODUCTNAME Master Document" ;
@@ -480,11 +289,6 @@ String STR_SVT_MIMETYPE_CNT_SFSYSFOLDER
     Text [ en-US ] = "System folder" ;
 };
 
-String STR_SVT_MIMETYPE_CNT_SFSYSFILE
-{
-    Text [ en-US ] = "System object" ;
-};
-
 String STR_SVT_MIMETYPE_APP_TEMPLATE
 {
     Text [ en-US ] = "%PRODUCTNAME Template";


More information about the Libreoffice-commits mailing list