create new 'enum class' SotClipboardFormatId to unify types

of which there are several.

There are some issues here I am unsure of
- the SW and SC and CHART2 modules essentially ignore the enum values and assign their own ids
  Perhaps I should change them to use the common values and create new enum values where necessary?
- the sc/qa/ and sq/qa/ and starmath/qa/ code was doing some dodgy stuff. I translated the code to pass down the stuff
   numeric values to the underlying code, but perhaps further fixing is necessary?

Change-Id: Ic06d723e404481e3f1bca67c43b70321b764d923

1 files changed, 117 insertions, 117 deletions

diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index 156f4fac96f4..888ab99fb81c 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -215,9 +215,9 @@ Sequence< OUString > SAL_CALL CDataFormatTranslator::getSupportedServiceNames( )
 
 void SAL_CALL CDataFormatTranslator::initTranslationTable()
 {
-    //SOT_FORMATSTR_ID_DIF
+    //SotClipboardFormatId::DIF
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-dif;windows_formatname=\"DIF\"", "DIF", "DIF", CF_DIF, CPPUTYPE_DEFAULT));
-    // SOT_FORMAT_BITMAP
+    // SotClipboardFormatId::BITMAP
 
     // #i124085# CF_DIBV5 disabled, leads to problems at export. To fully support, using
     // an own mime-type may be necessary. I have tried that, but saw no real advantages
@@ -227,7 +227,7 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
 
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", "Bitmap", CF_DIB, CPPUTYPE_DEFAULT));
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", "Bitmap", CF_BITMAP, CPPUTYPE_DEFAULT));
-    // SOT_FORMAT_STRING
+    // SotClipboardFormatId::STRING
     m_TranslTable.push_back(FormatEntry("text/plain;charset=utf-16", "Unicode-Text", "", CF_UNICODETEXT, CppuType_String));
     // Format Locale - for internal use
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-locale;windows_formatname=\"Locale\"", "Locale", "Locale", CF_LOCALE, CPPUTYPE_DEFAULT));
@@ -235,232 +235,232 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-wmf;windows_formatname=\"Image WMF\"", "Windows MetaFile", "Image WMF", CF_METAFILEPICT, CPPUTYPE_DEFAULT));
     // SOT_FORMAT_EMF
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-emf;windows_formatname=\"Image EMF\"", "Windows Enhanced MetaFile", "Image EMF", CF_ENHMETAFILE, CPPUTYPE_DEFAULT));
-    // SOT_FORMAT_FILE_LIST
+    // SotClipboardFormatId::FILE_LIST
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-filelist;windows_formatname=\"FileList\"", "FileList", "FileList", CF_HDROP, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_SYLK
+    //SotClipboardFormatId::SYLK
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sylk;windows_formatname=\"Sylk\"", "Sylk", "Sylk", CF_SYLK, CPPUTYPE_DEFAULT ) );
-    // SOT_FORMAT_GDIMETAFILE
+    // SotClipboardFormatId::GDIMETAFILE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"", "GDIMetaFile", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMAT_PRIVATE
+    // SotClipboardFormatId::PRIVATE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-private;windows_formatname=\"Private\"", "Private", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMAT_FILE
+    // SotClipboardFormatId::FILE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-file;windows_formatname=\"FileName\"", "FileName", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMAT_RTF
+    // SotClipboardFormatId::RTF
     m_TranslTable.push_back(FormatEntry("text/richtext", "Rich Text Format", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_DRAWING
+    // SotClipboardFormatId::DRAWING
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-drawing;windows_formatname=\"Drawing Format\"", "Drawing Format", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_SVXB
+    // SotClipboardFormatId::SVXB
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-svbx;windows_formatname=\"SVXB (StarView Bitmap/Animation)\"", "SVXB (StarView Bitmap/Animation)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_SVIM
+    // SotClipboardFormatId::SVIM
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-svim;windows_formatname=\"SVIM (StarView ImageMap)\"", "SVIM (StarView ImageMap)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_XFA
+    // SotClipboardFormatId::XFA
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-xfa;windows_formatname=\"XFA (XOutDev FillAttr)\"", "XFA (XOutDev FillAttr)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_EDITENGINE
+    // SotClipboardFormatId::EDITENGINE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-editengine;windows_formatname=\"EditEngineFormat\"", "EditEngineFormat", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_INTERNALLINK_STATE
+    // SotClipboardFormatId::INTERNALLINK_STATE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-internallink-state;windows_formatname=\"StatusInfo vom SvxInternalLink\"", "StatusInfo vom SvxInternalLink", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_SOLK
+    // SotClipboardFormatId::SOLK
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-solk;windows_formatname=\"SOLK (StarOffice Link)\"", "SOLK (StarOffice Link)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK
+    // SotClipboardFormatId::NETSCAPE_BOOKMARK
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-netscape-bookmark;windows_formatname=\"Netscape Bookmark\"", "Netscape Bookmark", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_TREELISTBOX
+    // SotClipboardFormatId::TREELISTBOX
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-treelistbox;windows_formatname=\"SV_LBOX_DD_FORMAT\"", "SV_LBOX_DD_FORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_NATIVE
+    // SotClipboardFormatId::NATIVE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-native;windows_formatname=\"Native\"", "Native", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_OWNERLINK
+    // SotClipboardFormatId::OWNERLINK
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-ownerlink;windows_formatname=\"OwnerLink\"", "OwnerLink", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_STARSERVER
+    // SotClipboardFormatId::STARSERVER
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starserver;windows_formatname=\"StarServerFormat\"", "StarServerFormat", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_STAROBJECT
+    // SotClipboardFormatId::STAROBJECT
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starobject;windows_formatname=\"StarObjectFormat\"", "StarObjectFormat", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_APPLETOBJECT
+    // SotClipboardFormatId::APPLETOBJECT
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-appletobject;windows_formatname=\"Applet Object\"", "Applet Object", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_PLUGIN_OBJECT
+    // SotClipboardFormatId::PLUGIN_OBJECT
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-plugin-object;windows_formatname=\"PlugIn Object\"", "PlugIn Object", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_STARWRITER_30
+    // SotClipboardFormatId::STARWRITER_30
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starwriter-30;windows_formatname=\"StarWriter 3.0\"", "StarWriter 3.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARWRITER_40
+    //SotClipboardFormatId::STARWRITER_40
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starwriter-40;windows_formatname=\"StarWriter 4.0\"", "StarWriter 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARWRITER_50
+    //SotClipboardFormatId::STARWRITER_50
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starwriter-50;windows_formatname=\"StarWriter 5.0\"", "StarWriter 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARWRITERWEB_40
+    //SotClipboardFormatId::STARWRITERWEB_40
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starwriterweb-40;windows_formatname=\"StarWriter/Web 4.0\"", "StarWriter/Web 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARWRITERWEB_50
+    //SotClipboardFormatId::STARWRITERWEB_50
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starwriterweb-50;windows_formatname=\"StarWriter/Web 5.0\"", "StarWriter/Web 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARWRITERGLOB_40
+    //SotClipboardFormatId::STARWRITERGLOB_40
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starwriterglob-40;windows_formatname=\"StarWriter/Global 4.0\"", "StarWriter/Global 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_STARWRITERGLOB_50
+    // SotClipboardFormatId::STARWRITERGLOB_50
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starwriterglob-50;windows_formatname=\"StarWriter/Global 5.0\"", "StarWriter/Global 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARDRAW
+    //SotClipboardFormatId::STARDRAW
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-stardraw;windows_formatname=\"StarDrawDocument\"", "StarDrawDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARDRAW_40
+    //SotClipboardFormatId::STARDRAW_40
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-stardraw-40;windows_formatname=\"StarDrawDocument 4.0\"", "StarDrawDocument 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARIMPRESS_50
+    //SotClipboardFormatId::STARIMPRESS_50
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starimpress-50;windows_formatname=\"StarImpress 5.0\"", "StarImpress 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_STARDRAW_50
+    // SotClipboardFormatId::STARDRAW_50
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-stardraw-50;windows_formatname=\"StarDraw 5.0\"", "StarDraw 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARCALC
+    //SotClipboardFormatId::STARCALC
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starcalc;windows_formatname=\"StarCalcDocument\"", "StarCalcDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARCALC_40
+    //SotClipboardFormatId::STARCALC_40
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starcalc-40;windows_formatname=\"StarCalc 4.0\"", "StarCalc 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_STARCALC_50
+    // SotClipboardFormatId::STARCALC_50
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starcalc-50;windows_formatname=\"StarCalc 5.0\"", "StarCalc 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_STARCHART
+    // SotClipboardFormatId::STARCHART
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starchart;windows_formatname=\"StarChartDocument\"", "StarChartDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_STARCHART_40
+    // SotClipboardFormatId::STARCHART_40
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starchart-40;windows_formatname=\"StarChartDocument 4.0\"", "StarChartDocument 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    // SOT_FORMATSTR_ID_STARCHART_50
+    // SotClipboardFormatId::STARCHART_50
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starchart-50;windows_formatname=\"StarChart 5.0\"", "StarChart 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARIMAGE
+    //SotClipboardFormatId::STARIMAGE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starimage;windows_formatname=\"StarImageDocument\"", "StarImageDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARIMAGE_40
+    //SotClipboardFormatId::STARIMAGE_40
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starimage-40;windows_formatname=\"StarImageDocument 4.0\"", "StarImageDocument 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARIMAGE_50
+    //SotClipboardFormatId::STARIMAGE_50
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starimage-50;windows_formatname=\"StarImage 5.0\"",  "StarImage 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARMATH
+    //SotClipboardFormatId::STARMATH
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starmath;windows_formatname=\"StarMath\"", "StarMath", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARMATH_40
+    //SotClipboardFormatId::STARMATH_40
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starmath-40;windows_formatname=\"StarMathDocument 4.0\"", "StarMathDocument 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARMATH_50
+    //SotClipboardFormatId::STARMATH_50
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starmath-50;windows_formatname=\"StarMath 5.0\"", "StarMath 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STAROBJECT_PAINTDOC
+    //SotClipboardFormatId::STAROBJECT_PAINTDOC
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starobject-paintdoc;windows_formatname=\"StarObjectPaintDocument\"", "StarObjectPaintDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_FILLED_AREA
+    //SotClipboardFormatId::FILLED_AREA
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-filled-area;windows_formatname=\"FilledArea\"", "FilledArea", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_HTML
+    //SotClipboardFormatId::HTML
     m_TranslTable.push_back(FormatEntry("text/html", "HTML (HyperText Markup Language)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_HTML_SIMPLE
+    //SotClipboardFormatId::HTML_SIMPLE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-html-simple;windows_formatname=\"HTML Format\"", "HTML Format", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_CHAOS
+    //SotClipboardFormatId::CHAOS
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-chaos;windows_formatname=\"FORMAT_CHAOS\"", "FORMAT_CHAOS", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_CNT_MSGATTACHFILE
+    //SotClipboardFormatId::CNT_MSGATTACHFILE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-msgattachfile;windows_formatname=\"CNT_MSGATTACHFILE_FORMAT\"", "CNT_MSGATTACHFILE_FORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_BIFF_5
+    //SotClipboardFormatId::BIFF_5
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-biff5;windows_formatname=\"Biff5\"", "Biff5", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_BIFF__5
+    //SotClipboardFormatId::BIFF__5
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-biff-5;windows_formatname=\"Biff 5\"", "Biff 5", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_BIFF_8
+    //SotClipboardFormatId::BIFF_8
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-biff-8;windows_formatname=\"Biff8\"", "Biff8", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_SYLK_BIGCAPS
+    //SotClipboardFormatId::SYLK_BIGCAPS
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sylk-bigcaps;windows_formatname=\"SYLK\"", "SYLK", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_LINK
+    //SotClipboardFormatId::LINK
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-link;windows_formatname=\"Link\"", "Link", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARDRAW_TABBAR
+    //SotClipboardFormatId::STARDRAW_TABBAR
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-stardraw-tabbar;windows_formatname=\"StarDraw TabBar\"", "StarDraw TabBar", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_SONLK
+    //SotClipboardFormatId::SONLK
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sonlk;windows_formatname=\"SONLK (StarOffice Navi Link)\"", "SONLK (StarOffice Navi Link)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_MSWORD_DOC
+    //SotClipboardFormatId::MSWORD_DOC
     m_TranslTable.push_back(FormatEntry("application/msword", "MSWordDoc", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STAR_FRAMESET_DOC
+    //SotClipboardFormatId::STAR_FRAMESET_DOC
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-star-frameset-doc;windows_formatname=\"StarFrameSetDocument\"", "StarFrameSetDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_OFFICE_DOC
+    //SotClipboardFormatId::OFFICE_DOC
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-office-doc;windows_formatname=\"OfficeDocument\"", "OfficeDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_NOTES_DOCINFO
+    //SotClipboardFormatId::NOTES_DOCINFO
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-notes-docinfo;windows_formatname=\"NotesDocInfo\"", "NotesDocInfo", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_NOTES_HNOTE
+    //SotClipboardFormatId::NOTES_HNOTE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-notes-hnote;windows_formatname=\"NoteshNote\"", "NoteshNote", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_NOTES_NATIVE
+    //SotClipboardFormatId::NOTES_NATIVE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-notes-native;windows_formatname=\"Native\"", "Native", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_SFX_DOC
+    //SotClipboardFormatId::SFX_DOC
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sfx-doc;windows_formatname=\"SfxDocument\"", "SfxDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_EVDF
+    //SotClipboardFormatId::EVDF
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-evdf;windows_formatname=\"EVDF (Explorer View Dummy Format)\"", "EVDF (Explorer View Dummy Format)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_ESDF
+    //SotClipboardFormatId::ESDF
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-esdf;windows_formatname=\"ESDF (Explorer Search Dummy Format)\"", "ESDF (Explorer Search Dummy Format)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_IDF
+    //SotClipboardFormatId::IDF
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-idf;windows_formatname=\"IDF (Iconview Dummy Format)\"", "IDF (Iconview Dummy Format)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_EFTP
+    //SotClipboardFormatId::EFTP
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-eftp;windows_formatname=\"EFTP (Explorer Ftp File)\"", "EFTP (Explorer Ftp File)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_EFD
+    //SotClipboardFormatId::EFD
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-efd;windows_formatname=\"EFD (Explorer Ftp Dir)\"", "EFD (Explorer Ftp Dir)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH
+    //SotClipboardFormatId::SVX_FORMFIELDEXCH
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-svx-formfieldexch;windows_formatname=\"SvxFormFieldExch\"", "SvxFormFieldExch", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_EXTENDED_TABBAR
+    //SotClipboardFormatId::EXTENDED_TABBAR
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-extended-tabbar;windows_formatname=\"ExtendedTabBar\"", "ExtendedTabBar", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_SBA_DATAEXCHANGE
+    //SotClipboardFormatId::SBA_DATAEXCHANGE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-dataexchange;windows_formatname=\"SBA-DATAFORMAT\"", "SBA-DATAFORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE
+    //SotClipboardFormatId::SBA_FIELDDATAEXCHANGE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-fielddataexchange;windows_formatname=\"SBA-FIELDFORMAT\"", "SBA-FIELDFORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_SBA_PRIVATE_URL
+    //SotClipboardFormatId::SBA_PRIVATE_URL
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-private-url;windows_formatname=\"SBA-PRIVATEURLFORMAT\"", "SBA-PRIVATEURLFORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_SBA_TABED
+    //SotClipboardFormatId::SBA_TABED
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-tabed;windows_formatname=\"Tabed\"", "Tabed", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_SBA_TABID
+    //SotClipboardFormatId::SBA_TABID
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-tabid;windows_formatname=\"Tabid\"", "Tabid", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_SBA_JOIN
+    //SotClipboardFormatId::SBA_JOIN
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-join;windows_formatname=\"SBA-JOINFORMAT\"", "SBA-JOINFORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_OBJECTDESCRIPTOR
+    //SotClipboardFormatId::OBJECTDESCRIPTOR
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"", "Star Object Descriptor (XML)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR
+    //SotClipboardFormatId::LINKSRCDESCRIPTOR
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-linksrcdescriptor-xml;windows_formatname=\"Star Link Source Descriptor (XML)\"", "Star Link Source Descriptor (XML)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_EMBED_SOURCE
+    //SotClipboardFormatId::EMBED_SOURCE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"", "Star Embed Source (XML)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_LINK_SOURCE
+    //SotClipboardFormatId::LINK_SOURCE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-link-source-xml;windows_formatname=\"Star Link Source (XML)\"", "Star Link Source (XML)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_EMBEDDED_OBJ
+    //SotClipboardFormatId::EMBEDDED_OBJ
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-embedded-obj-xml;windows_formatname=\"Star Embedded Object (XML)\"", "Star Embedded Object (XML)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_FILECONTENT
+    //SotClipboardFormatId::FILECONTENT
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-filecontent;windows_formatname=\"" CFSTR_FILECONTENTS "\"", CFSTR_FILECONTENTS, NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR
+    //SotClipboardFormatId::FILEGRPDESCRIPTOR
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-filegrpdescriptor;windows_formatname=\"" CFSTR_FILEDESCRIPTOR "\"", CFSTR_FILEDESCRIPTOR, NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_FILENAME
+    //SotClipboardFormatId::FILENAME
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-filename;windows_formatname=\"" CFSTR_FILENAME "\"", CFSTR_FILENAME, NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_SD_OLE
+    //SotClipboardFormatId::SD_OLE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sd-ole;windows_formatname=\"SD-OLE\"", "SD-OLE", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE
+    //SotClipboardFormatId::EMBEDDED_OBJ_OLE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-embedded-obj-ole;windows_formatname=\"Embedded Object\"", "Embedded Object", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_EMBED_SOURCE_OLE
+    //SotClipboardFormatId::EMBED_SOURCE_OLE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-embed-source-ole;windows_formatname=\"Embed Source\"", "Embed Source", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE
+    //SotClipboardFormatId::OBJECTDESCRIPTOR_OLE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-objectdescriptor-ole;windows_formatname=\"Object Descriptor\"", "Object Descriptor", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR_OLE
+    //SotClipboardFormatId::LINKSRCDESCRIPTOR_OLE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-linkdescriptor-ole;windows_formatname=\"Link Source Descriptor\"", "Link Source Descriptor", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_LINK_SOURCE_OLE
+    //SotClipboardFormatId::LINK_SOURCE_OLE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-link-source-ole;windows_formatname=\"Link Source\"", "Link Source", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE
+    //SotClipboardFormatId::SBA_CTRLDATAEXCHANGE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-ctrldataexchange;windows_formatname=\"SBA-CTRLFORMAT\"", "SBA-CTRLFORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_OUTPLACE_OBJ
+    //SotClipboardFormatId::OUTPLACE_OBJ
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-outplace-obj;windows_formatname=\"OutPlace Object\"", "OutPlace Object", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_CNT_OWN_CLIP
+    //SotClipboardFormatId::CNT_OWN_CLIP
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-cnt-own-clip;windows_formatname=\"CntOwnClipboard\"", "CntOwnClipboard", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_INET_IMAGE
+    //SotClipboardFormatId::INET_IMAGE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-inet-image;windows_formatname=\"SO-INet-Image\"", "SO-INet-Image", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_NETSCAPE_IMAGE
+    //SotClipboardFormatId::NETSCAPE_IMAGE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-netscape-image;windows_formatname=\"Netscape Image Format\"", "Netscape Image Format", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_SBA_FORMEXCHANGE
-    m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-formexchange;windows_formatname=\"SBA_FORMEXCHANGE\"", "SBA_FORMEXCHANGE", NULL, CF_INVALID, CPPUTYPE_DEFAULT));  //SOT_FORMATSTR_ID_SBA_REPORTEXCHANGE
+    //SotClipboardFormatId::SBA_FORMEXCHANGE
+    m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-formexchange;windows_formatname=\"SBA_FORMEXCHANGE\"", "SBA_FORMEXCHANGE", NULL, CF_INVALID, CPPUTYPE_DEFAULT));  //SotClipboardFormatId::SBA_REPORTEXCHANGE
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-reportexchange;windows_formatname=\"SBA_REPORTEXCHANGE\"", "SBA_REPORTEXCHANGE", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR
+    //SotClipboardFormatId::UNIFORMRESOURCELOCATOR
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-uniformresourcelocator;windows_formatname=\"UniformResourceLocator\"", "UniformResourceLocator", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARCHARTDOCUMENT_50
+    //SotClipboardFormatId::STARCHARTDOCUMENT_50
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-starchartdocument-50;windows_formatname=\"StarChartDocument 5.0\"", "StarChartDocument 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_GRAPHOBJ
+    //SotClipboardFormatId::GRAPHOBJ
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-graphobj;windows_formatname=\"Graphic Object\"", "Graphic Object", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARWRITER_60
+    //SotClipboardFormatId::STARWRITER_60
     m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.writer", "Writer 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARWRITERWEB_60
+    //SotClipboardFormatId::STARWRITERWEB_60
     m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.writer.web", "Writer/Web 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARWRITERGLOB_60
+    //SotClipboardFormatId::STARWRITERGLOB_60
     m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.writer.global", "Writer/Global 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARWDRAW_60
+    //SotClipboardFormatId::STARWDRAW_60
     m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.draw", "Draw 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARIMPRESS_60
+    //SotClipboardFormatId::STARIMPRESS_60
     m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.impress", "Impress 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARCALC_60
+    //SotClipboardFormatId::STARCALC_60
     m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.calc", "Calc 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARCHART_60
+    //SotClipboardFormatId::STARCHART_60
     m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.chart", "Chart 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_STARMATH_60
+    //SotClipboardFormatId::STARMATH_60
     m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.math", "Math 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_DIALOG_60
+    //SotClipboardFormatId::DIALOG_60
     m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.dialog", "Dialog 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_BMP
+    //SotClipboardFormatId::BMP
     m_TranslTable.push_back(FormatEntry("image/bmp", "Windows Bitmap", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_PNG
+    //SotClipboardFormatId::PNG
     m_TranslTable.push_back(FormatEntry("image/png", "PNG", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_DUMMY3
+    //SotClipboardFormatId::DUMMY3
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-dummy3;windows_formatname=\"SO_DUMMYFORMAT_3\"", "SO_DUMMYFORMAT_3", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
-    //SOT_FORMATSTR_ID_DUMMY4
+    //SotClipboardFormatId::DUMMY4
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-dummy4;windows_formatname=\"SO_DUMMYFORMAT_4\"", "SO_DUMMYFORMAT_4", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
 }