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

34 files changed, 398 insertions, 395 deletions

diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 9b917728bc53..7461487771f0 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -242,7 +242,7 @@ public:
     virtual void ReconnectDdeLink(SfxObjectShell& rServer) SAL_OVERRIDE;
 
     virtual void FillClass( SvGlobalName * pClassName,
-                                   sal_uInt32 * pClipFormat,
+                                   SotClipboardFormatId * pClipFormat,
                                    OUString * pAppName,
                                    OUString * pLongUserName,
                                    OUString * pUserName,
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index dc8edfd3153c..03aca2b9712c 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -29,6 +29,7 @@
 #include <flyenum.hxx>
 
 #include <svx/svdtypes.hxx>
+#include <sot/formats.hxx>
 #include <rtl/ustring.hxx>
 #include <svtools/embedhlp.hxx>
 #include <o3tl/typed_flags_set.hxx>
@@ -520,7 +521,7 @@ public:
 
     /** Get selected DrawObj as graphics (MetaFile/Bitmap).
      Return value indicates if it was converted. */
-    bool GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const;
+    bool GetDrawObjGraphic( SotClipboardFormatId nFmt, Graphic& rGrf ) const;
 
     void Paste( SvStream& rStm, sal_uInt16 nAction, const Point* pPt = 0 );
     bool Paste( const Graphic &rGrf, const OUString& rURL );
diff --git a/sw/inc/globdoc.hxx b/sw/inc/globdoc.hxx
index 4aee52bb303f..d2a7452aeb85 100644
--- a/sw/inc/globdoc.hxx
+++ b/sw/inc/globdoc.hxx
@@ -32,7 +32,7 @@ public:
     virtual ~SwGlobalDocShell();
 
     virtual void    FillClass( SvGlobalName * pClassName,
-                                   sal_uInt32 * pClipFormat,
+                                   SotClipboardFormatId * pClipFormat,
                                    OUString * pAppName,
                                    OUString * pLongUserName,
                                    OUString * pUserName,
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index f32b7b4f0478..ecb83af8b5b9 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -42,7 +42,7 @@ protected:
 public:
     TYPEINFO_OVERRIDE();
 
-    SwBaseLink( sal_uInt16 nMode, sal_uInt16 nFormat, SwCntntNode* pNode = 0 )
+    SwBaseLink( sal_uInt16 nMode, SotClipboardFormatId nFormat, SwCntntNode* pNode = 0 )
         : ::sfx2::SvBaseLink( nMode, nFormat ), pCntntNode( pNode ),
         bSwapIn( false ), bNoDataFlag( false ), bIgnoreDataChanged( false ),
         m_pReReadThread(0)
diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx
index f142de2cb17b..f365f935784b 100644
--- a/sw/inc/wdocsh.hxx
+++ b/sw/inc/wdocsh.hxx
@@ -42,7 +42,7 @@ public:
     virtual ~SwWebDocShell();
 
     virtual void        FillClass( SvGlobalName * pClassName,
-                                   sal_uInt32 * pClipFormat,
+                                   SotClipboardFormatId * pClipFormat,
                                    OUString * pAppName,
                                    OUString * pLongUserName,
                                    OUString * pUserName,
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index 527f3ae3d50f..3de7da278397 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -44,10 +44,10 @@ class SwFiltersTest
 public:
     virtual bool load( const OUString &rFilter, const OUString &rURL,
         const OUString &rUserData, unsigned int nFilterFlags,
-        unsigned int nClipboardID, unsigned int nFilterVersion) SAL_OVERRIDE;
+        SotClipboardFormatId nClipboardID, unsigned int nFilterVersion) SAL_OVERRIDE;
     virtual bool save( const OUString &rFilter, const OUString &rURL,
         const OUString &rUserData, unsigned int nFilterFlags,
-        unsigned int nClipboardID, unsigned int nFilterVersion) SAL_OVERRIDE;
+        SotClipboardFormatId nClipboardID, unsigned int nFilterVersion) SAL_OVERRIDE;
     virtual void setUp() SAL_OVERRIDE;
 
     // Ensure CVEs remain unbroken
@@ -60,27 +60,27 @@ public:
 private:
     bool filter( const OUString &rFilter, const OUString &rURL,
         const OUString &rUserData, unsigned int nFilterFlags,
-        unsigned int nClipboardID, unsigned int nFilterVersion, bool bExport);
+        SotClipboardFormatId nClipboardID, unsigned int nFilterVersion, bool bExport);
     uno::Reference<uno::XInterface> m_xWriterComponent;
 };
 
 bool SwFiltersTest::load(const OUString &rFilter, const OUString &rURL,
     const OUString &rUserData, unsigned int nFilterFlags,
-        unsigned int nClipboardID, unsigned int nFilterVersion)
+        SotClipboardFormatId nClipboardID, unsigned int nFilterVersion)
 {
     return filter(rFilter, rURL, rUserData, nFilterFlags, nClipboardID, nFilterVersion, false);
 }
 
 bool SwFiltersTest::save(const OUString &rFilter, const OUString &rURL,
     const OUString &rUserData, unsigned int nFilterFlags,
-        unsigned int nClipboardID, unsigned int nFilterVersion)
+        SotClipboardFormatId nClipboardID, unsigned int nFilterVersion)
 {
     return filter(rFilter, rURL, rUserData, nFilterFlags, nClipboardID, nFilterVersion, true);
 }
 
 bool SwFiltersTest::filter(const OUString &rFilter, const OUString &rURL,
     const OUString &rUserData, unsigned int nFilterFlags,
-        unsigned int nClipboardID, unsigned int nFilterVersion, bool bExport)
+        SotClipboardFormatId nClipboardID, unsigned int nFilterVersion, bool bExport)
 {
     SfxFilter* pFilter = new SfxFilter(
         rFilter, OUString(), nFilterFlags,
@@ -131,7 +131,7 @@ bool SwFiltersTest::filter(const OUString &rFilter, const OUString &rURL,
     return bSaved;
 }
 
-#define isstorage 1
+#define isstorage SotClipboardFormatId::STRING
 
 void SwFiltersTest::testCVEs()
 {
@@ -182,7 +182,7 @@ void SwFiltersTest::testCVEs()
             getURLFromSrc("/sw/qa/core/exportdata/rtf/"),
             OUString(),
             SFX_FILTER_STARONEFILTER,
-            0,
+            SotClipboardFormatId::NONE,
             0,
             /*bExport=*/true);
 
@@ -190,7 +190,7 @@ void SwFiltersTest::testCVEs()
             getURLFromSrc("/sw/qa/core/exportdata/html/"),
             OUString(sHTML),
             0,
-            0,
+            SotClipboardFormatId::NONE,
             0,
             /*bExport=*/true);
 
@@ -198,7 +198,7 @@ void SwFiltersTest::testCVEs()
             getURLFromSrc("/sw/qa/core/exportdata/ooxml/"),
             OUString(),
             SFX_FILTER_STARONEFILTER,
-            0,
+            SotClipboardFormatId::NONE,
             0,
             /*bExport=*/true);
 
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 29f02fcd5a77..9cf6407686d4 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -174,7 +174,7 @@ void SwDocTest::testFileNameFields()
 
     SfxFilter aFilter(
         OUString("Text"),
-        OUString(), 0, 0, OUString(), 0, OUString(),
+        OUString(), 0, SotClipboardFormatId::NONE, OUString(), 0, OUString(),
         OUString("TEXT"), OUString() );
     aDstMed.SetFilter(&aFilter);
 
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index 4487b256d818..af84712d3b83 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -46,14 +46,15 @@ bool SwServerObject::GetData( uno::Any & rData,
     WriterRef xWrt;
     switch( SotExchange::GetFormatIdFromMimeType( rMimeType ) )
     {
-    case FORMAT_STRING:
+    case SotClipboardFormatId::STRING:
         ::GetASCWriter( OUString(), OUString(), xWrt );
         break;
 
-    case FORMAT_RTF:
+    case SotClipboardFormatId::RTF:
         // mba: no BaseURL for data exchange
         ::GetRTFWriter( OUString(), OUString(), xWrt );
         break;
+    default: break;
     }
 
     if( xWrt.Is() )
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 62e00e663e8f..2bc1eb1b10b4 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -72,7 +72,7 @@ class SwIntrnlSectRefLink : public SwBaseLink
 {
     SwSectionFmt& rSectFmt;
 public:
-    SwIntrnlSectRefLink( SwSectionFmt& rFmt, sal_uInt16 nUpdateType, sal_uInt16 nFmt )
+    SwIntrnlSectRefLink( SwSectionFmt& rFmt, sal_uInt16 nUpdateType, SotClipboardFormatId nFmt )
         : SwBaseLink( nUpdateType, nFmt ),
         rSectFmt( rFmt )
     {}
@@ -1144,7 +1144,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
         return ;
 
     const OUString sName( pDShell->GetMedium()->GetName() );
-    const OUString sMimeType( SotExchange::GetFormatMimeType( FORMAT_FILE ));
+    const OUString sMimeType( SotExchange::GetFormatMimeType( SotClipboardFormatId::FILE ));
     uno::Any aValue;
     aValue <<= sName; // Arbitrary name
 
@@ -1189,7 +1189,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
     SwSectionNode* pSectNd = rSectFmt.GetSectionNode( false );
     SwDoc* pDoc = rSectFmt.GetDoc();
 
-    sal_uLong nDataFormat = SotExchange::GetFormatIdFromMimeType( rMimeType );
+    SotClipboardFormatId nDataFormat = SotExchange::GetFormatIdFromMimeType( rMimeType );
 
     if( !pSectNd || !pDoc || pDoc->IsInDtor() || ChkNoDataFlag() ||
         sfx2::LinkManager::RegisterStatusInfoId() == nDataFormat )
@@ -1248,15 +1248,15 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
     Reader* pRead = 0;
     switch( nDataFormat )
     {
-    case FORMAT_STRING:
+    case SotClipboardFormatId::STRING:
         pRead = ReadAscii;
         break;
 
-    case FORMAT_RTF:
+    case SotClipboardFormatId::RTF:
         pRead = SwReaderWriter::GetReader( READER_WRITER_RTF );
         break;
 
-    case FORMAT_FILE:
+    case SotClipboardFormatId::FILE:
         if ( rValue.hasValue() )
         {
             OUString sFileName;
@@ -1400,6 +1400,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
             }
         }
         break;
+    default: break;
     }
 
     // Only create DDE if Shell is available!
@@ -1510,7 +1511,7 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
     if (!m_RefLink.Is())
     {
         // create BaseLink
-        m_RefLink = new SwIntrnlSectRefLink( *pFmt, nUpdateType, FORMAT_RTF );
+        m_RefLink = new SwIntrnlSectRefLink( *pFmt, nUpdateType, SotClipboardFormatId::RTF );
     }
     else
     {
@@ -1532,7 +1533,7 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
         break;
     case FILE_LINK_SECTION:
         {
-            pLnk->SetContentType( FORMAT_FILE );
+            pLnk->SetContentType( SotClipboardFormatId::FILE );
             sal_Int32 nIndex = 0;
             const OUString sFile(sCmd.getToken( 0, sfx2::cTokenSeparator, nIndex ));
             const OUString sFltr(sCmd.getToken( 0, sfx2::cTokenSeparator, nIndex ));
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index c391d49a55ae..70204f3d2618 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -95,7 +95,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
         return SUCCESS;
     }
 
-    sal_uLong nFmt = SotExchange::GetFormatIdFromMimeType( rMimeType );
+    SotClipboardFormatId nFmt = SotExchange::GetFormatIdFromMimeType( rMimeType );
 
     if( pCntntNode->IsNoTxtNode() &&
         nFmt == sfx2::LinkManager::RegisterStatusInfoId() )
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 81d1517e2ac2..5d2a2b148aa7 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -43,7 +43,7 @@ class SwIntrnlRefLink : public SwBaseLink
 {
     SwDDEFieldType& rFldType;
 public:
-    SwIntrnlRefLink( SwDDEFieldType& rType, sal_uInt16 nUpdateType, sal_uInt16 nFmt )
+    SwIntrnlRefLink( SwDDEFieldType& rType, sal_uInt16 nUpdateType, SotClipboardFormatId nFmt )
         : SwBaseLink( nUpdateType, nFmt ),
         rFldType( rType )
     {}
@@ -62,7 +62,7 @@ public:
 {
     switch( SotExchange::GetFormatIdFromMimeType( rMimeType ) )
     {
-    case FORMAT_STRING:
+    case SotClipboardFormatId::STRING:
         if( !IsNoDataFlag() )
         {
             uno::Sequence< sal_Int8 > aSeq;
@@ -233,7 +233,7 @@ SwDDEFieldType::SwDDEFieldType(const OUString& rName,
     aName( rName ), pDoc( 0 ), nRefCnt( 0 )
 {
     bCRLFFlag = bDeleted = false;
-    refLink = new SwIntrnlRefLink( *this, nUpdateType, FORMAT_STRING );
+    refLink = new SwIntrnlRefLink( *this, nUpdateType, SotClipboardFormatId::STRING );
     SetCmd( rCmd );
 }
 
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index c4e2a350ac94..69226a020ac6 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -1209,7 +1209,7 @@ bool SwFEShell::PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt1
     return true;
 }
 
-bool SwFEShell::GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const
+bool SwFEShell::GetDrawObjGraphic( SotClipboardFormatId nFmt, Graphic& rGrf ) const
 {
     OSL_ENSURE( Imp()->HasDrawView(), "GetDrawObjGraphic without DrawView?" );
     const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList();
@@ -1226,7 +1226,7 @@ bool SwFEShell::GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const
                 if ( pGrf )
                 {
                     Graphic aGrf( *pGrf );
-                    if( SOT_FORMAT_GDIMETAFILE == nFmt )
+                    if( SotClipboardFormatId::GDIMETAFILE == nFmt )
                     {
                         if( GRAPHIC_BITMAP != aGrf.GetType() )
                         {
@@ -1284,9 +1284,9 @@ bool SwFEShell::GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const
                 }
             }
         }
-        else if( SOT_FORMAT_GDIMETAFILE == nFmt )
+        else if( SotClipboardFormatId::GDIMETAFILE == nFmt )
             rGrf = Imp()->GetDrawView()->GetMarkedObjMetaFile();
-        else if( SOT_FORMAT_BITMAP == nFmt || SOT_FORMATSTR_ID_PNG == nFmt )
+        else if( SotClipboardFormatId::BITMAP == nFmt || SotClipboardFormatId::PNG == nFmt )
             rGrf = Imp()->GetDrawView()->GetMarkedObjBitmapEx();
     }
     return bConvert;
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 80abe8c2ac39..2ae7c955fbed 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -697,7 +697,7 @@ bool SwGrfNode::RestorePersistentData()
 
 void SwGrfNode::InsertLink( const OUString& rGrfName, const OUString& rFltName )
 {
-    refLink = new SwBaseLink( sfx2::LINKUPDATE_ONCALL, FORMAT_GDIMETAFILE, this );
+    refLink = new SwBaseLink( sfx2::LINKUPDATE_ONCALL, SotClipboardFormatId::GDIMETAFILE, this );
 
     IDocumentLinksAdministration* pIDLA = getIDocumentLinksAdministration();
     if( GetNodes().IsDocNodes() )
@@ -717,7 +717,7 @@ void SwGrfNode::InsertLink( const OUString& rGrfName, const OUString& rFltName )
         {
             const bool bSync = rFltName == "SYNCHRON";
             refLink->SetSynchron( bSync );
-            refLink->SetContentType( SOT_FORMATSTR_ID_SVXB );
+            refLink->SetContentType( SotClipboardFormatId::SVXB );
 
             pIDLA->GetLinkManager().InsertFileLink( *refLink,
                                             OBJECT_CLIENT_GRF, rGrfName,
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 50c0dc654743..b6898e549028 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -159,7 +159,7 @@ public:
 };
 
 SwEmbedObjectLink::SwEmbedObjectLink(SwOLENode* pNode):
-    ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ),
+    ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SotClipboardFormatId::SVXB ),
     pOleNode(pNode)
 {
     SetSynchron( false );
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 5234dce06df4..4154767253e9 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -303,7 +303,7 @@ sal_uLong SwXMLTextBlocks::StartPutBlock( const OUString& rShort, const OUString
 
         uno::Reference< beans::XPropertySet > xRootProps( xRoot, uno::UNO_QUERY_THROW );
         OUString aPropName( "MediaType" );
-        OUString aMime( SotExchange::GetFormatMimeType( SOT_FORMATSTR_ID_STARWRITER_8 ) );
+        OUString aMime( SotExchange::GetFormatMimeType( SotClipboardFormatId::STARWRITER_8 ) );
         xRootProps->setPropertyValue( aPropName, uno::makeAny( aMime ) );
     }
     catch (const uno::Exception&)
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index afb847de1aa7..c6d90dedd1bf 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -179,8 +179,7 @@ sal_uLong SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx,
         try
         {
             xRoot = xBlkRoot->openStorageElement( aPackageName, embed::ElementModes::READ );
-            long nTmp = SOT_FORMATSTR_ID_STARWRITER_60;
-            bool bOasis = ( SotStorage::GetVersion( xRoot ) > nTmp );
+            bool bOasis = SotStorage::GetVersion( xRoot ) > SOFFICE_FILEFORMAT_60;
 
             OUString sStreamName("atevent.xml");
             uno::Reference < io::XStream > xDocStream = xRoot->openStreamElement(
@@ -554,8 +553,7 @@ sal_uLong SwXMLTextBlocks::SetMacroTable(
         {
             xRoot = xBlkRoot->openStorageElement( aPackageName, embed::ElementModes::WRITE );
             OUString sStreamName("atevent.xml" );
-            long nTmp = SOT_FORMATSTR_ID_STARWRITER_60;
-            bool bOasis = ( SotStorage::GetVersion( xRoot ) > nTmp );
+            bool bOasis = SotStorage::GetVersion( xRoot ) > SOFFICE_FILEFORMAT_60;
 
             uno::Reference < io::XStream > xDocStream = xRoot->openStreamElement( sStreamName,
                         embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE );
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index cef4d239ab84..e9bb306c9310 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -92,10 +92,10 @@ bool SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < com::s
     bool bRet = false;
     try
     {
-        sal_uLong nStgFmtId = SotStorage::GetFormatID( rStg );
+        SotClipboardFormatId nStgFmtId = SotStorage::GetFormatID( rStg );
         bRet = rStg->isStreamElement( OUString("content.xml") );
         if ( bRet )
-            bRet = ( nStgFmtId && ( rFilter.GetFormat() == nStgFmtId ) );
+            bRet = ( nStgFmtId != SotClipboardFormatId::NONE && ( rFilter.GetFormat() == nStgFmtId ) );
     }
     catch (const com::sun::star::uno::Exception& )
     {
@@ -106,13 +106,13 @@ bool SwIoSystem::IsValidStgFilter( const com::sun::star::uno::Reference < com::s
 
 bool SwIoSystem::IsValidStgFilter(SotStorage& rStg, const SfxFilter& rFilter)
 {
-    sal_uLong nStgFmtId = rStg.GetFormat();
+    SotClipboardFormatId nStgFmtId = rStg.GetFormat();
     /*#i8409# We cannot trust the clipboard id anymore :-(*/
     if (rFilter.GetUserData() == FILTER_WW8 || rFilter.GetUserData() == sWW6)
-        nStgFmtId = 0;
+        nStgFmtId = SotClipboardFormatId::NONE;
 
     bool bRet = SVSTREAM_OK == rStg.GetError() &&
-        ( !nStgFmtId || rFilter.GetFormat() == nStgFmtId ) &&
+        ( nStgFmtId == SotClipboardFormatId::NONE || rFilter.GetFormat() == nStgFmtId ) &&
         ( rStg.IsContained( SwIoSystem::GetSubStorageName( rFilter )) );
     if( bRet )
     {
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 15308941e99c..864db7fc8cbc 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3388,7 +3388,7 @@ void WW8Export::PrepareStorage()
 
     SvGlobalName aGName( nId1, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00,
                          0x00, 0x00, 0x00, 0x46 );
-    GetWriter().GetStorage().SetClass( aGName, 0, OUString::createFromAscii( pName ));
+    GetWriter().GetStorage().SetClass( aGName, SotClipboardFormatId::NONE, OUString::createFromAscii( pName ));
     SvStorageStreamRef xStor( GetWriter().GetStorage().OpenSotStream(sCompObj) );
     xStor->Write( pData, nLen );
 
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 25a16f9a2083..cd8af756ab45 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1377,9 +1377,9 @@ static void lcl_ReadSections( SfxMedium& rMedium, ComboBox& rBox )
     if( rMedium.IsStorage() && (xStg = rMedium.GetStorage()).is() )
     {
         std::vector<OUString*> aArr;
-        sal_uInt32 nFormat = SotStorage::GetFormatID( xStg );
-        if ( nFormat == SOT_FORMATSTR_ID_STARWRITER_60 || nFormat == SOT_FORMATSTR_ID_STARWRITERGLOB_60 ||
-            nFormat == SOT_FORMATSTR_ID_STARWRITER_8 || nFormat == SOT_FORMATSTR_ID_STARWRITERGLOB_8)
+        SotClipboardFormatId nFormat = SotStorage::GetFormatID( xStg );
+        if ( nFormat == SotClipboardFormatId::STARWRITER_60 || nFormat == SotClipboardFormatId::STARWRITERGLOB_60 ||
+            nFormat == SotClipboardFormatId::STARWRITER_8 || nFormat == SotClipboardFormatId::STARWRITERGLOB_8)
             SwGetReaderXML()->GetSectionList( rMedium, aArr );
 
         for(std::vector<OUString*>::const_iterator it(aArr.begin()); it != aArr.end(); ++it) {
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 5660bc8fa178..9aa2c2dda517 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -637,17 +637,17 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium )
 
         // determine the desired Type
         sal_uInt8 nSaveType = 0;
-        sal_uLong nSaveClipId = pFlt->GetFormat();
-        if( SOT_FORMATSTR_ID_STARWRITERWEB_8 == nSaveClipId ||
-            SOT_FORMATSTR_ID_STARWRITERWEB_60 == nSaveClipId ||
-            SOT_FORMATSTR_ID_STARWRITERWEB_50 == nSaveClipId ||
-            SOT_FORMATSTR_ID_STARWRITERWEB_40 == nSaveClipId )
+        SotClipboardFormatId nSaveClipId = pFlt->GetFormat();
+        if( SotClipboardFormatId::STARWRITERWEB_8 == nSaveClipId ||
+            SotClipboardFormatId::STARWRITERWEB_60 == nSaveClipId ||
+            SotClipboardFormatId::STARWRITERWEB_50 == nSaveClipId ||
+            SotClipboardFormatId::STARWRITERWEB_40 == nSaveClipId )
             nSaveType = 1;
-        else if( SOT_FORMATSTR_ID_STARWRITERGLOB_8 == nSaveClipId ||
-                 SOT_FORMATSTR_ID_STARWRITERGLOB_8_TEMPLATE == nSaveClipId ||
-                 SOT_FORMATSTR_ID_STARWRITERGLOB_60 == nSaveClipId ||
-                 SOT_FORMATSTR_ID_STARWRITERGLOB_50 == nSaveClipId ||
-                 SOT_FORMATSTR_ID_STARWRITERGLOB_40 == nSaveClipId )
+        else if( SotClipboardFormatId::STARWRITERGLOB_8 == nSaveClipId ||
+                 SotClipboardFormatId::STARWRITERGLOB_8_TEMPLATE == nSaveClipId ||
+                 SotClipboardFormatId::STARWRITERGLOB_60 == nSaveClipId ||
+                 SotClipboardFormatId::STARWRITERGLOB_50 == nSaveClipId ||
+                 SotClipboardFormatId::STARWRITERGLOB_40 == nSaveClipId )
             nSaveType = 2;
 
         // Change Flags of the Document accordingly
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 1ece5cd5f485..2650f8cea84b 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -812,7 +812,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                         ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >
                                                         xRef( pClipCntnr );
 
-                        pClipCntnr->CopyAnyData( FORMAT_RTF, (sal_Char*)
+                        pClipCntnr->CopyAnyData( SotClipboardFormatId::RTF, (sal_Char*)
                                     pStrm->GetData(), pStrm->GetEndOfData() );
                         pClipCntnr->CopyToClipboard(
                             GetView()? &GetView()->GetEditWin() : 0 );
@@ -1171,7 +1171,7 @@ void SwDocShell::ReconnectDdeLink(SfxObjectShell& rServer)
 }
 
 void SwDocShell::FillClass( SvGlobalName * pClassName,
-                                   sal_uInt32 * pClipFormat,
+                                   SotClipboardFormatId * pClipFormat,
                                    OUString * /*pAppName*/,
                                    OUString * pLongUserName,
                                    OUString * pUserName,
@@ -1181,13 +1181,13 @@ void SwDocShell::FillClass( SvGlobalName * pClassName,
     if (nVersion == SOFFICE_FILEFORMAT_60)
     {
         *pClassName     = SvGlobalName( SO3_SW_CLASSID_60 );
-        *pClipFormat    = SOT_FORMATSTR_ID_STARWRITER_60;
+        *pClipFormat    = SotClipboardFormatId::STARWRITER_60;
         *pLongUserName = SW_RESSTR(STR_WRITER_DOCUMENT_FULLTYPE);
     }
     else if (nVersion == SOFFICE_FILEFORMAT_8)
     {
         *pClassName     = SvGlobalName( SO3_SW_CLASSID_60 );
-        *pClipFormat    = bTemplate ? SOT_FORMATSTR_ID_STARWRITER_8_TEMPLATE : SOT_FORMATSTR_ID_STARWRITER_8;
+        *pClipFormat    = bTemplate ? SotClipboardFormatId::STARWRITER_8_TEMPLATE : SotClipboardFormatId::STARWRITER_8;
         *pLongUserName = SW_RESSTR(STR_WRITER_DOCUMENT_FULLTYPE);
     }
 // #FIXME check with new Event handling
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 0e1275a69aad..a9f60cff73be 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -501,7 +501,7 @@ void SwDBTreeList::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ )
             sDBName += "." + sColumnName;
         }
 
-        pContainer->CopyString( FORMAT_STRING, sDBName );
+        pContainer->CopyString( SotClipboardFormatId::STRING, sDBName );
         pContainer->StartDrag( this, DND_ACTION_COPY | DND_ACTION_LINK,
                                 Link() );
     }
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index b658b7f04c19..fdb2dee289d0 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -136,12 +136,12 @@ extern bool g_bExecuteDrag;
 
 #define OLESIZE 11905 - 2 * lMinBorder, 6 * MM50
 
-#define SWTRANSFER_OBJECTTYPE_DRAWMODEL         0x00000001
-#define SWTRANSFER_OBJECTTYPE_HTML              0x00000002
-#define SWTRANSFER_OBJECTTYPE_RTF               0x00000004
-#define SWTRANSFER_OBJECTTYPE_STRING            0x00000008
-#define SWTRANSFER_OBJECTTYPE_SWOLE             0x00000010
-#define SWTRANSFER_OBJECTTYPE_DDE               0x00000020
+#define SWTRANSFER_OBJECTTYPE_DRAWMODEL         static_cast<SotClipboardFormatId>(0x00000001)
+#define SWTRANSFER_OBJECTTYPE_HTML              static_cast<SotClipboardFormatId>(0x00000002)
+#define SWTRANSFER_OBJECTTYPE_RTF               static_cast<SotClipboardFormatId>(0x00000004)
+#define SWTRANSFER_OBJECTTYPE_STRING            static_cast<SotClipboardFormatId>(0x00000008)
+#define SWTRANSFER_OBJECTTYPE_SWOLE             static_cast<SotClipboardFormatId>(0x00000010)
+#define SWTRANSFER_OBJECTTYPE_DDE               static_cast<SotClipboardFormatId>(0x00000020)
 
 using namespace ::svx;
 using namespace ::com::sun::star;
@@ -355,7 +355,7 @@ const Graphic* SwTransferable::FindOLEReplacementGraphic() const
 
 void SwTransferable::RemoveDDELinkFormat( const vcl::Window& rWin )
 {
-    RemoveFormat( SOT_FORMATSTR_ID_LINK );
+    RemoveFormat( SotClipboardFormatId::LINK );
     CopyToClipboard( (vcl::Window*)&rWin );
 }
 
@@ -401,7 +401,7 @@ namespace
 
 bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDoc )
 {
-    sal_uInt32  nFormat = SotExchange::GetFormat( rFlavor );
+    SotClipboardFormatId nFormat = SotExchange::GetFormat( rFlavor );
 
     // we can only fullfil the request if
     // 1) we have data for this format
@@ -423,10 +423,10 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
         if(bPending || ((nsSelectionType::SEL_GRF | nsSelectionType::SEL_DRW_FORM) & nSelectionType))
         {
             pClpGraphic = new Graphic;
-            if( !pWrtShell->GetDrawObjGraphic( FORMAT_GDIMETAFILE, *pClpGraphic ))
+            if( !pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::GDIMETAFILE, *pClpGraphic ))
                 pOrigGrf = pClpGraphic;
             pClpBitmap = new Graphic;
-            if( !pWrtShell->GetDrawObjGraphic( FORMAT_BITMAP, *pClpBitmap ))
+            if( !pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::BITMAP, *pClpBitmap ))
                 pOrigGrf = pClpBitmap;
 
             // is it an URL-Button ?
@@ -503,7 +503,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
         // the following solution will be used in the case when the object can not generate the image
         // TODO/LATER: in future the transferhelper must probably be created based on object and the replacement stream
         // TODO: Block not required now, SvEmbedTransferHelper should be able to handle GDIMetaFile format
-        if ( nFormat == SOT_FORMAT_GDIMETAFILE )
+        if ( nFormat == SotClipboardFormatId::GDIMETAFILE )
         {
             pOLEGraph = FindOLEReplacementGraphic();
             if ( pOLEGraph )
@@ -514,18 +514,18 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
     {
         switch( nFormat )
         {
-        case SOT_FORMATSTR_ID_LINK:
+        case SotClipboardFormatId::LINK:
             if( refDdeLink.Is() )
                 bOK = SetObject( &refDdeLink,
                                     SWTRANSFER_OBJECTTYPE_DDE, rFlavor );
             break;
 
-        case SOT_FORMATSTR_ID_OBJECTDESCRIPTOR:
-        case SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR:
+        case SotClipboardFormatId::OBJECTDESCRIPTOR:
+        case SotClipboardFormatId::LINKSRCDESCRIPTOR:
             bOK = SetTransferableObjectDescriptor( aObjDesc, rFlavor );
             break;
 
-        case SOT_FORMATSTR_ID_DRAWING:
+        case SotClipboardFormatId::DRAWING:
             {
                 SwDoc *const pDoc = lcl_GetDoc(*pClpDocFac);
                 bOK = SetObject( pDoc->getIDocumentDrawModelAccess().GetDrawModel(),
@@ -533,63 +533,63 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
             }
             break;
 
-        case SOT_FORMAT_STRING:
+        case SotClipboardFormatId::STRING:
         {
             SwDoc *const pDoc = lcl_GetDoc(*pClpDocFac);
             bOK = SetObject( pDoc, SWTRANSFER_OBJECTTYPE_STRING, rFlavor );
         }
         break;
-        case SOT_FORMAT_RTF:
+        case SotClipboardFormatId::RTF:
         {
             SwDoc *const pDoc = lcl_GetDoc(*pClpDocFac);
             bOK = SetObject( pDoc, SWTRANSFER_OBJECTTYPE_RTF, rFlavor );
         }
             break;
 
-        case SOT_FORMATSTR_ID_HTML:
+        case SotClipboardFormatId::HTML:
         {
             SwDoc *const pDoc = lcl_GetDoc(*pClpDocFac);
             bOK = SetObject( pDoc, SWTRANSFER_OBJECTTYPE_HTML, rFlavor );
         }
             break;
 
-        case SOT_FORMATSTR_ID_SVXB:
+        case SotClipboardFormatId::SVXB:
             if( eBufferType & TRNSFR_GRAPHIC && pOrigGrf )
                 bOK = SetGraphic( *pOrigGrf, rFlavor );
             break;
 
-        case SOT_FORMAT_GDIMETAFILE:
+        case SotClipboardFormatId::GDIMETAFILE:
             if( eBufferType & TRNSFR_GRAPHIC )
                 bOK = SetGDIMetaFile( pClpGraphic->GetGDIMetaFile(), rFlavor );
             break;
-        case SOT_FORMAT_BITMAP:
-        case SOT_FORMATSTR_ID_PNG:
+        case SotClipboardFormatId::BITMAP:
+        case SotClipboardFormatId::PNG:
             // Neither pClpBitmap nor pClpGraphic are necessarily set
             if( (eBufferType & TRNSFR_GRAPHIC) && (pClpBitmap != 0 || pClpGraphic != 0))
                 bOK = SetBitmapEx( (pClpBitmap ? pClpBitmap : pClpGraphic)->GetBitmapEx(), rFlavor );
             break;
 
-        case SOT_FORMATSTR_ID_SVIM:
+        case SotClipboardFormatId::SVIM:
             if( pImageMap )
                 bOK = SetImageMap( *pImageMap, rFlavor );
             break;
 
-        case SOT_FORMATSTR_ID_INET_IMAGE:
+        case SotClipboardFormatId::INET_IMAGE:
             if( pTargetURL )
                 bOK = SetINetImage( *pTargetURL, rFlavor );
             break;
 
-        case SOT_FORMATSTR_ID_SOLK:
-        case SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK:
-        case SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR:
-        case SOT_FORMATSTR_ID_FILECONTENT:
-        case SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR:
-        case SOT_FORMAT_FILE:
+        case SotClipboardFormatId::SOLK:
+        case SotClipboardFormatId::NETSCAPE_BOOKMARK:
+        case SotClipboardFormatId::FILEGRPDESCRIPTOR:
+        case SotClipboardFormatId::FILECONTENT:
+        case SotClipboardFormatId::UNIFORMRESOURCELOCATOR:
+        case SotClipboardFormatId::FILE:
             if( (TRNSFR_INETFLD & eBufferType) && pBkmk )
                 bOK = SetINetBookmark( *pBkmk, rFlavor );
             break;
 
-        case SOT_FORMATSTR_ID_EMBED_SOURCE:
+        case SotClipboardFormatId::EMBED_SOURCE:
             if( !aDocShellRef.Is() )
             {
                 SwDoc *const pDoc = lcl_GetDoc(*pClpDocFac);
@@ -602,13 +602,14 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
             bOK = SetObject( &aDocShellRef, SWTRANSFER_OBJECTTYPE_SWOLE,
                             rFlavor );
             break;
+         default: break;
         }
     }
     return bOK;
 }
 
 bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
-                                    void* pObject, sal_uInt32 nObjectType,
+                                    void* pObject, SotClipboardFormatId nObjectType,
                                     const DataFlavor& /*rFlavor*/ )
 {
     bool bRet = false;
@@ -732,6 +733,7 @@ bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
             xWrt->bUCS2_WithStartChar = false;
         }
         break;
+    default: break;
     }
 
     if( xWrt.Is() )
@@ -792,10 +794,10 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
     if( nSelection == nsSelectionType::SEL_GRF )
     {
         pClpGraphic = new Graphic;
-        if( !pWrtShell->GetDrawObjGraphic( FORMAT_GDIMETAFILE, *pClpGraphic ))
+        if( !pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::GDIMETAFILE, *pClpGraphic ))
             pOrigGrf = pClpGraphic;
         pClpBitmap = new Graphic;
-        if( !pWrtShell->GetDrawObjGraphic( FORMAT_BITMAP, *pClpBitmap ))
+        if( !pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::BITMAP, *pClpBitmap ))
             pOrigGrf = pClpBitmap;
 
         pClpDocFac = new SwDocFac;
@@ -803,17 +805,17 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
         pWrtShell->Copy( pDoc );
 
         if (pOrigGrf && !pOrigGrf->GetBitmap().IsEmpty())
-          AddFormat( SOT_FORMATSTR_ID_SVXB );
+          AddFormat( SotClipboardFormatId::SVXB );
 
         PrepareOLE( aObjDesc );
-        AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
+        AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
 
         const Graphic* pGrf = pWrtShell->GetGraphic();
         if( pGrf && pGrf->IsSupportedGraphic() )
         {
-            AddFormat( FORMAT_GDIMETAFILE );
-            AddFormat( SOT_FORMATSTR_ID_PNG );
-            AddFormat( FORMAT_BITMAP );
+            AddFormat( SotClipboardFormatId::GDIMETAFILE );
+            AddFormat( SotClipboardFormatId::PNG );
+            AddFormat( SotClipboardFormatId::BITMAP );
         }
         eBufferType = TRNSFR_GRAPHIC;
         pWrtShell->GetGrfNms( &sGrfNm, 0 );
@@ -826,16 +828,16 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
         aDocShellRef->DoInitNew( NULL );
         pWrtShell->Copy( pDoc );
 
-        AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
+        AddFormat( SotClipboardFormatId::EMBED_SOURCE );
 
         // --> OD #i98753#
         // set size of embedded object at the object description structure
         aObjDesc.maSize = OutputDevice::LogicToLogic( pWrtShell->GetObjSize(), MAP_TWIP, MAP_100TH_MM );
         // <--
         PrepareOLE( aObjDesc );
-        AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
+        AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
 
-        AddFormat( FORMAT_GDIMETAFILE );
+        AddFormat( SotClipboardFormatId::GDIMETAFILE );
 
         // Fetch the formats supported via embedtransferhelper as well
         sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
@@ -918,33 +920,33 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
         }
 
         //When someone needs it, we 'OLE' him something
-        AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
+        AddFormat( SotClipboardFormatId::EMBED_SOURCE );
 
         //put RTF ahead of  the OLE's Metafile to have less loss
         if( !pWrtShell->IsObjSelected() )
         {
-            AddFormat( FORMAT_RTF );
-            AddFormat( SOT_FORMATSTR_ID_HTML );
+            AddFormat( SotClipboardFormatId::RTF );
+            AddFormat( SotClipboardFormatId::HTML );
         }
         if( pWrtShell->IsSelection() )
-            AddFormat( FORMAT_STRING );
+            AddFormat( SotClipboardFormatId::STRING );
 
         if( nSelection & ( nsSelectionType::SEL_DRW | nsSelectionType::SEL_DRW_FORM ))
         {
-            AddFormat( SOT_FORMATSTR_ID_DRAWING );
+            AddFormat( SotClipboardFormatId::DRAWING );
             if ( nSelection & nsSelectionType::SEL_DRW )
             {
-                AddFormat( FORMAT_GDIMETAFILE );
-                AddFormat( SOT_FORMATSTR_ID_PNG );
-                AddFormat( FORMAT_BITMAP );
+                AddFormat( SotClipboardFormatId::GDIMETAFILE );
+                AddFormat( SotClipboardFormatId::PNG );
+                AddFormat( SotClipboardFormatId::BITMAP );
             }
             eBufferType = (TransferBufferType)( TRNSFR_GRAPHIC | eBufferType );
 
             pClpGraphic = new Graphic;
-            if( !pWrtShell->GetDrawObjGraphic( FORMAT_GDIMETAFILE, *pClpGraphic ))
+            if( !pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::GDIMETAFILE, *pClpGraphic ))
                 pOrigGrf = pClpGraphic;
             pClpBitmap = new Graphic;
-            if( !pWrtShell->GetDrawObjGraphic( FORMAT_BITMAP, *pClpBitmap ))
+            if( !pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::BITMAP, *pClpBitmap ))
                 pOrigGrf = pClpBitmap;
 
             // is it an URL-Button ?
@@ -952,12 +954,12 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
             OUString sDesc;
             if( pWrtShell->GetURLFromButton( sURL, sDesc ) )
             {
-                AddFormat( FORMAT_STRING );
-                 AddFormat( SOT_FORMATSTR_ID_SOLK );
-                 AddFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK );
-                 AddFormat( SOT_FORMATSTR_ID_FILECONTENT );
-                 AddFormat( SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR );
-                 AddFormat( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR );
+                AddFormat( SotClipboardFormatId::STRING );
+                 AddFormat( SotClipboardFormatId::SOLK );
+                 AddFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK );
+                 AddFormat( SotClipboardFormatId::FILECONTENT );
+                 AddFormat( SotClipboardFormatId::FILEGRPDESCRIPTOR );
+                 AddFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR );
                 eBufferType = (TransferBufferType)( TRNSFR_INETFLD | eBufferType );
                 nRet = 1;
             }
@@ -969,7 +971,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
             0 != ( pDShell = pWrtShell->GetDoc()->GetDocShell()) &&
             SFX_CREATE_MODE_STANDARD == pDShell->GetCreateMode() )
         {
-            AddFormat( SOT_FORMATSTR_ID_LINK );
+            AddFormat( SotClipboardFormatId::LINK );
             refDdeLink = new SwTrnsfrDdeLink( *this, *pWrtShell );
         }
 
@@ -981,7 +983,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
         aObjDesc.maSize = OutputDevice::LogicToLogic( aSz, MAP_TWIP, MAP_100TH_MM );
 
         PrepareOLE( aObjDesc );
-        AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
+        AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
     }
     else
         nRet = 0;
@@ -994,14 +996,14 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
         if( rURL.GetMap() )
         {
             pImageMap = new ImageMap( *rURL.GetMap() );
-            AddFormat( SOT_FORMATSTR_ID_SVIM );
+            AddFormat( SotClipboardFormatId::SVIM );
         }
         else if( !rURL.GetURL().isEmpty() )
         {
             pTargetURL = new INetImage( sGrfNm, rURL.GetURL(),
                                         rURL.GetTargetFrameName(),
                                         aEmptyOUStr, Size() );
-            AddFormat( SOT_FORMATSTR_ID_INET_IMAGE );
+            AddFormat( SotClipboardFormatId::INET_IMAGE );
         }
     }
 
@@ -1030,7 +1032,7 @@ int SwTransferable::CalculateAndCopy()
     SwDoc *const pDoc = lcl_GetDoc(*pClpDocFac);
     pWrtShell->Copy(pDoc, & aStr);
     eBufferType = TRNSFR_DOCUMENT;
-    AddFormat( FORMAT_STRING );
+    AddFormat( SotClipboardFormatId::STRING );
 
     CopyToClipboard( &pWrtShell->GetView().GetEditWin() );
 
@@ -1065,10 +1067,10 @@ int SwTransferable::CopyGlossary( SwTextBlocks& rGlossary,
     eBufferType = TRNSFR_DOCUMENT;
 
     //When someone needs it, we 'OLE' her something.
-    AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
-    AddFormat( FORMAT_RTF );
-    AddFormat( SOT_FORMATSTR_ID_HTML );
-    AddFormat( FORMAT_STRING );
+    AddFormat( SotClipboardFormatId::EMBED_SOURCE );
+    AddFormat( SotClipboardFormatId::RTF );
+    AddFormat( SotClipboardFormatId::HTML );
+    AddFormat( SotClipboardFormatId::STRING );
 
     //ObjectDescriptor was already filled from the old DocShell.
     //Now adjust it. Thus in GetData the first query can still
@@ -1078,7 +1080,7 @@ int SwTransferable::CopyGlossary( SwTextBlocks& rGlossary,
     aObjDesc.maSize = OutputDevice::LogicToLogic( aSz, MAP_TWIP, MAP_100TH_MM );
 
     PrepareOLE( aObjDesc );
-    AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
+    AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
 
     CopyToClipboard( &pWrtShell->GetView().GetEditWin() );
 
@@ -1114,14 +1116,14 @@ bool SwTransferable::IsPaste( const SwWrtShell& rSh,
                                     ? EXCHG_IN_ACTION_COPY
                      : EXCHG_IN_ACTION_MOVE);
 
-        sal_uLong nFormat;          // output param for GetExchangeAction
+        SotClipboardFormatId nFormat;          // output param for GetExchangeAction
         sal_uInt16 nEventAction;    // output param for GetExchangeAction
         sal_uInt16 nAction = SotExchange::GetExchangeAction(
                                 rData.GetDataFlavorExVector(),
                                 nDestination,
                                 nSourceOptions,             /* ?? */
                                 EXCHG_IN_ACTION_DEFAULT,    /* ?? */
-                                nFormat, nEventAction, 0,
+                                nFormat, nEventAction, SotClipboardFormatId::NONE,
                                 lcl_getTransferPointer ( xTransferable ) );
 
         // if we find a suitable action, we can paste!
@@ -1135,7 +1137,7 @@ bool SwTransferable::Paste( SwWrtShell& rSh, TransferableDataHelper& rData )
 {
     sal_uInt16 nEventAction, nAction=0;
     SotExchangeDest nDestination = SwTransferable::GetSotDestination( rSh );
-    sal_uLong nFormat = 0;
+    SotClipboardFormatId nFormat = SotClipboardFormatId::NONE;
 
     if( GetSwTransferable( rData ) )
     {
@@ -1156,17 +1158,17 @@ bool SwTransferable::Paste( SwWrtShell& rSh, TransferableDataHelper& rData )
                                     nDestination,
                                     nSourceOptions,             /* ?? */
                                     EXCHG_IN_ACTION_DEFAULT,    /* ?? */
-                                    nFormat, nEventAction, 0,
+                                    nFormat, nEventAction, SotClipboardFormatId::NONE,
                                     lcl_getTransferPointer ( xTransferable ) );
     }
 
     // special case for tables from draw application
     if( EXCHG_OUT_ACTION_INSERT_DRAWOBJ == (nAction & EXCHG_ACTION_MASK) )
     {
-        if( rData.HasFormat( SOT_FORMAT_RTF ) )
+        if( rData.HasFormat( SotClipboardFormatId::RTF ) )
         {
             nAction = EXCHG_OUT_ACTION_INSERT_STRING | (nAction & ~EXCHG_ACTION_MASK);
-            nFormat = SOT_FORMAT_RTF;
+            nFormat = SotClipboardFormatId::RTF;
         }
     }
 
@@ -1176,7 +1178,7 @@ bool SwTransferable::Paste( SwWrtShell& rSh, TransferableDataHelper& rData )
 }
 
 bool SwTransferable::PasteData( TransferableDataHelper& rData,
-                            SwWrtShell& rSh, sal_uInt16 nAction, sal_uLong nFormat,
+                            SwWrtShell& rSh, sal_uInt16 nAction, SotClipboardFormatId nFormat,
                             SotExchangeDest nDestination, bool bIsPasteFmt,
                             bool bIsDefault,
                             const Point* pPt, sal_Int8 nDropAction,
@@ -1315,22 +1317,22 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
             // then we have to use the format
             switch( nFormat )
             {
-            case SOT_FORMATSTR_ID_DRAWING:
+            case SotClipboardFormatId::DRAWING:
                 nRet = SwTransferable::_PasteSdrFormat( rData, rSh,
                                                 SW_PASTESDR_INSERT, pPt,
                                                 nActionFlags, bNeedToSelectBeforePaste);
                 break;
 
-            case SOT_FORMATSTR_ID_HTML:
-            case SOT_FORMATSTR_ID_HTML_SIMPLE:
-            case SOT_FORMATSTR_ID_HTML_NO_COMMENT:
-            case SOT_FORMAT_RTF:
-            case SOT_FORMAT_STRING:
+            case SotClipboardFormatId::HTML:
+            case SotClipboardFormatId::HTML_SIMPLE:
+            case SotClipboardFormatId::HTML_NO_COMMENT:
+            case SotClipboardFormatId::RTF:
+            case SotClipboardFormatId::STRING:
                 nRet = SwTransferable::_PasteFileContent( rData, rSh,
                                                             nFormat, bMsg );
                 break;
 
-            case SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK:
+            case SotClipboardFormatId::NETSCAPE_BOOKMARK:
                 {
                     INetBookmark aBkmk;
                     if( rData.GetINetBookmark( nFormat, aBkmk ) )
@@ -1342,34 +1344,34 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
                 }
                 break;
 
-            case SOT_FORMATSTR_ID_SD_OLE:
+            case SotClipboardFormatId::SD_OLE:
                 nRet = SwTransferable::_PasteOLE( rData, rSh, nFormat,
                                                     nActionFlags, bMsg );
                 break;
 
-            case SOT_FORMATSTR_ID_SVIM:
+            case SotClipboardFormatId::SVIM:
                 nRet = SwTransferable::_PasteImageMap( rData, rSh );
                 break;
 
-            case SOT_FORMATSTR_ID_SVXB:
-            case SOT_FORMAT_BITMAP:
-            case SOT_FORMATSTR_ID_PNG:
-            case SOT_FORMAT_GDIMETAFILE:
+            case SotClipboardFormatId::SVXB:
+            case SotClipboardFormatId::BITMAP:
+            case SotClipboardFormatId::PNG:
+            case SotClipboardFormatId::GDIMETAFILE:
                 nRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
                                                 SW_PASTESDR_INSERT,pPt,
                                                 nActionFlags, nDropAction, bNeedToSelectBeforePaste);
                 break;
 
-            case SOT_FORMATSTR_ID_XFORMS:
-            case SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE:
-            case SOT_FORMATSTR_ID_SBA_DATAEXCHANGE:
-            case SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE:
+            case SotClipboardFormatId::XFORMS:
+            case SotClipboardFormatId::SBA_FIELDDATAEXCHANGE:
+            case SotClipboardFormatId::SBA_DATAEXCHANGE:
+            case SotClipboardFormatId::SBA_CTRLDATAEXCHANGE:
                 nRet = SwTransferable::_PasteDBData( rData, rSh, nFormat,
                                             EXCHG_IN_ACTION_LINK == nClearedAction,
                                             pPt, bMsg );
                 break;
 
-            case SOT_FORMAT_FILE:
+            case SotClipboardFormatId::FILE:
                 nRet = SwTransferable::_PasteFileName( rData, rSh, nFormat,
                                 ( EXCHG_IN_ACTION_MOVE == nClearedAction
                                     ? SW_PASTESDR_REPLACE
@@ -1379,14 +1381,14 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
                                 pPt, nActionFlags, bMsg, 0 );
                 break;
 
-            case SOT_FORMAT_FILE_LIST:
+            case SotClipboardFormatId::FILE_LIST:
                 // then insert as graphics only
                 nRet = SwTransferable::_PasteFileList( rData, rSh,
                                     EXCHG_IN_ACTION_LINK == nClearedAction,
                                     pPt, bMsg );
                 break;
 
-            case SOT_FORMATSTR_ID_SONLK:
+            case SotClipboardFormatId::SONLK:
                 if( pPt )
                 {
                     NaviContentBookmark aBkmk;
@@ -1407,8 +1409,8 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
                 }
                 break;
 
-            case SOT_FORMATSTR_ID_INET_IMAGE:
-            case SOT_FORMATSTR_ID_NETSCAPE_IMAGE:
+            case SotClipboardFormatId::INET_IMAGE:
+            case SotClipboardFormatId::NETSCAPE_IMAGE:
                 nRet = SwTransferable::_PasteTargetURL( rData, rSh,
                                                         SW_PASTESDR_INSERT,
                                                         pPt, true );
@@ -1446,7 +1448,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
         case EXCHG_OUT_ACTION_INSERT_HYPERLINK:
             {
                 OUString sURL, sDesc;
-                if( SOT_FORMAT_FILE == nFormat )
+                if( SotClipboardFormatId::FILE == nFormat )
                 {
                     if( rData.GetString( nFormat, sURL ) && !sURL.isEmpty() )
                     {
@@ -1478,19 +1480,19 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
         case EXCHG_OUT_ACTION_GET_ATTRIBUTES:
             switch( nFormat )
             {
-            case SOT_FORMATSTR_ID_DRAWING:
+            case SotClipboardFormatId::DRAWING:
                 nRet = SwTransferable::_PasteSdrFormat( rData, rSh,
                                                 SW_PASTESDR_SETATTR, pPt,
                                                 nActionFlags, bNeedToSelectBeforePaste);
                 break;
-            case SOT_FORMATSTR_ID_SVXB:
-            case SOT_FORMAT_GDIMETAFILE:
-            case SOT_FORMAT_BITMAP:
-            case SOT_FORMATSTR_ID_PNG:
-            case SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK:
-            case SOT_FORMAT_FILE:
-            case SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR:
-            case SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR:
+            case SotClipboardFormatId::SVXB:
+            case SotClipboardFormatId::GDIMETAFILE:
+            case SotClipboardFormatId::BITMAP:
+            case SotClipboardFormatId::PNG:
+            case SotClipboardFormatId::NETSCAPE_BOOKMARK:
+            case SotClipboardFormatId::FILE:
+            case SotClipboardFormatId::FILEGRPDESCRIPTOR:
+            case SotClipboardFormatId::UNIFORMRESOURCELOCATOR:
                 nRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
                                                 SW_PASTESDR_SETATTR, pPt,
                                                 nActionFlags, nDropAction, bNeedToSelectBeforePaste);
@@ -1624,7 +1626,7 @@ SotExchangeDest SwTransferable::GetSotDestination( const SwWrtShell& rSh,
 }
 
 bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
-                                    SwWrtShell& rSh, sal_uLong nFmt, bool bMsg )
+                                    SwWrtShell& rSh, SotClipboardFormatId nFmt, bool bMsg )
 {
     sal_uInt16 nResId = STR_CLPBRD_FORMAT_ERROR;
     bool nRet = false;
@@ -1637,7 +1639,7 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
     OUString sData;
     switch( nFmt )
     {
-    case SOT_FORMAT_STRING:
+    case SotClipboardFormatId::STRING:
         {
             pRead = ReadAscii;
             if( rData.GetString( nFmt, sData ) )
@@ -1662,21 +1664,21 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
     default:
         if( rData.GetSotStorageStream( nFmt, xStrm ) )
         {
-            if( ( SOT_FORMATSTR_ID_HTML_SIMPLE == nFmt ) ||
-                ( SOT_FORMATSTR_ID_HTML_NO_COMMENT == nFmt ) )
+            if( ( SotClipboardFormatId::HTML_SIMPLE == nFmt ) ||
+                ( SotClipboardFormatId::HTML_NO_COMMENT == nFmt ) )
             {
                 pStream = aMSE40ClpObj.IsValid( *xStrm );
                 pRead = ReadHTML;
                 pRead->SetReadUTF8( true );
 
                 bool bNoComments =
-                    ( nFmt == SOT_FORMATSTR_ID_HTML_NO_COMMENT );
+                    ( nFmt == SotClipboardFormatId::HTML_NO_COMMENT );
                 pRead->SetIgnoreHTMLComments( bNoComments );
             }
             else
             {
                 pStream = &xStrm;
-                if( SOT_FORMAT_RTF == nFmt )
+                if( SotClipboardFormatId::RTF == nFmt )
                     pRead = SwReaderWriter::GetReader( READER_WRITER_RTF );
                 else if( !pRead )
                 {
@@ -1720,7 +1722,7 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
 }
 
 bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
-                                sal_uLong nFmt, sal_uInt8 nActionFlags, bool bMsg )
+                                SotClipboardFormatId nFmt, sal_uInt8 nActionFlags, bool bMsg )
 {
     bool nRet = false;
     TransferableObjectDescriptor aObjDesc;
@@ -1729,16 +1731,16 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
     Reader* pRead = 0;
 
     // Get the preferred format
-    SotFormatStringId nId;
-    if( rData.HasFormat( SOT_FORMATSTR_ID_EMBEDDED_OBJ ) )
-        nId = SOT_FORMATSTR_ID_EMBEDDED_OBJ;
-    else if( rData.HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ) &&
-             rData.HasFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ))
-        nId = SOT_FORMATSTR_ID_EMBED_SOURCE;
+    SotClipboardFormatId nId;
+    if( rData.HasFormat( SotClipboardFormatId::EMBEDDED_OBJ ) )
+        nId = SotClipboardFormatId::EMBEDDED_OBJ;
+    else if( rData.HasFormat( SotClipboardFormatId::EMBED_SOURCE ) &&
+             rData.HasFormat( SotClipboardFormatId::OBJECTDESCRIPTOR ))
+        nId = SotClipboardFormatId::EMBED_SOURCE;
     else
-        nId = 0;
+        nId = SotClipboardFormatId::NONE;
 
-    if (nId)
+    if (nId != SotClipboardFormatId::NONE)
     {
         SwDocShell* pDocSh = rSh.GetDoc()->GetDocShell();
         xStrm = rData.GetInputStream(nId, SfxObjectShell::CreateShellID(pDocSh));
@@ -1753,12 +1755,12 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
             xStore = comphelper::OStorageHelper::GetStorageFromInputStream( xStrm );
             switch( SotStorage::GetFormatID( xStore ) )
             {
-                case SOT_FORMATSTR_ID_STARWRITER_60:
-                case SOT_FORMATSTR_ID_STARWRITERWEB_60:
-                case SOT_FORMATSTR_ID_STARWRITERGLOB_60:
-                case SOT_FORMATSTR_ID_STARWRITER_8:
-                case SOT_FORMATSTR_ID_STARWRITERWEB_8:
-                case SOT_FORMATSTR_ID_STARWRITERGLOB_8:
+                case SotClipboardFormatId::STARWRITER_60:
+                case SotClipboardFormatId::STARWRITERWEB_60:
+                case SotClipboardFormatId::STARWRITERGLOB_60:
+                case SotClipboardFormatId::STARWRITER_8:
+                case SotClipboardFormatId::STARWRITERWEB_8:
+                case SotClipboardFormatId::STARWRITERGLOB_8:
                     pRead = ReadXML;
                     break;
                 default:
@@ -1802,18 +1804,18 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
 
         if ( xStrm.is() )
         {
-            if ( !rData.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aObjDesc ) )
+            if ( !rData.GetTransferableObjectDescriptor( SotClipboardFormatId::OBJECTDESCRIPTOR, aObjDesc ) )
             {
                 OSL_ENSURE( !xStrm.is(), "An object without descriptor in clipboard!");
             }
         }
         else
         {
-            if( rData.HasFormat( nFmt = SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE ) && rData.GetTransferableObjectDescriptor( nFmt, aObjDesc ) )
+            if( rData.HasFormat( nFmt = SotClipboardFormatId::OBJECTDESCRIPTOR_OLE ) && rData.GetTransferableObjectDescriptor( nFmt, aObjDesc ) )
              {
-                xStrm = rData.GetInputStream(SOT_FORMATSTR_ID_EMBED_SOURCE_OLE, OUString());
+                xStrm = rData.GetInputStream(SotClipboardFormatId::EMBED_SOURCE_OLE, OUString());
                 if (!xStrm.is())
-                    xStrm = rData.GetInputStream(SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE, OUString());
+                    xStrm = rData.GetInputStream(SotClipboardFormatId::EMBEDDED_OBJ_OLE, OUString());
 
                 if ( !xStrm.is() )
                 {
@@ -1849,18 +1851,18 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
 
             // try to get the replacement image from the clipboard
             Graphic aGraphic;
-            sal_uLong nGrFormat = 0;
+            SotClipboardFormatId nGrFormat = SotClipboardFormatId::NONE;
 
             // limit the size of the preview metafile to 100000 actions
             GDIMetaFile aMetafile;
-            if (rData.GetGDIMetaFile(FORMAT_GDIMETAFILE, aMetafile, 100000))
+            if (rData.GetGDIMetaFile(SotClipboardFormatId::GDIMETAFILE, aMetafile, 100000))
             {
-                nGrFormat = SOT_FORMAT_GDIMETAFILE;
+                nGrFormat = SotClipboardFormatId::GDIMETAFILE;
                 aGraphic = aMetafile;
             }
 
             // insert replacement image ( if there is one ) into the object helper
-            if ( nGrFormat )
+            if ( nGrFormat != SotClipboardFormatId::NONE )
             {
                 DataFlavor aDataFlavor;
                 SotExchange::GetFormatDataFlavor( nGrFormat, aDataFlavor );
@@ -1948,10 +1950,10 @@ bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
 {
     bool nRet = false;
     INetImage aINetImg;
-    if( ( rData.HasFormat( SOT_FORMATSTR_ID_INET_IMAGE ) &&
-          rData.GetINetImage( SOT_FORMATSTR_ID_INET_IMAGE, aINetImg )) ||
-        ( rData.HasFormat( SOT_FORMATSTR_ID_NETSCAPE_IMAGE ) &&
-          rData.GetINetImage( SOT_FORMATSTR_ID_NETSCAPE_IMAGE, aINetImg )) )
+    if( ( rData.HasFormat( SotClipboardFormatId::INET_IMAGE ) &&
+          rData.GetINetImage( SotClipboardFormatId::INET_IMAGE, aINetImg )) ||
+        ( rData.HasFormat( SotClipboardFormatId::NETSCAPE_IMAGE ) &&
+          rData.GetINetImage( SotClipboardFormatId::NETSCAPE_IMAGE, aINetImg )) )
     {
         if( !aINetImg.GetImageURL().isEmpty() && bInsertGRF )
         {
@@ -2068,7 +2070,7 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
 
     {
         SotStorageStreamRef xStrm;
-        if( !rData.GetSotStorageStream( SOT_FORMATSTR_ID_LINK, xStrm ))
+        if( !rData.GetSotStorageStream( SotClipboardFormatId::LINK, xStrm ))
         {
             OSL_ENSURE( false, "DDE Data not found." );
             return false;
@@ -2084,12 +2086,12 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
     sfx2::MakeLnkName( aCmd, &aApp, aTopic, aItem );
 
     // do we want to read in a graphic now?
-    sal_uLong nFormat;
-    if( !rData.HasFormat( FORMAT_RTF ) &&
-        !rData.HasFormat( SOT_FORMATSTR_ID_HTML ) &&
-        !rData.HasFormat( FORMAT_STRING ) &&
-        (rData.HasFormat( nFormat = FORMAT_GDIMETAFILE ) ||
-         rData.HasFormat( nFormat = FORMAT_BITMAP )) )
+    SotClipboardFormatId nFormat;
+    if( !rData.HasFormat( SotClipboardFormatId::RTF ) &&
+        !rData.HasFormat( SotClipboardFormatId::HTML ) &&
+        !rData.HasFormat( SotClipboardFormatId::STRING ) &&
+        (rData.HasFormat( nFormat = SotClipboardFormatId::GDIMETAFILE ) ||
+         rData.HasFormat( nFormat = SotClipboardFormatId::BITMAP )) )
     {
         Graphic aGrf;
         bool nRet = rData.GetGraphic( nFormat, aGrf );
@@ -2150,13 +2152,13 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
     SwDDEFieldType* pDDETyp = static_cast<SwDDEFieldType*>(pTyp);
 
     OUString aExpand;
-    if( rData.GetString( FORMAT_STRING, aExpand ))
+    if( rData.GetString( SotClipboardFormatId::STRING, aExpand ))
     {
         do {            // middle checked loop
 
             // When data comes from a spreadsheet, we add a DDE-table
-            if( ( rData.HasFormat( SOT_FORMATSTR_ID_SYLK ) ||
-                  rData.HasFormat( SOT_FORMATSTR_ID_SYLK_BIGCAPS ) ) &&
+            if( ( rData.HasFormat( SotClipboardFormatId::SYLK ) ||
+                  rData.HasFormat( SotClipboardFormatId::SYLK_BIGCAPS ) ) &&
                 !aExpand.isEmpty() &&
                  ( 1 < comphelper::string::getTokenCount(aExpand, '\n') ||
                        comphelper::string::getTokenCount(aExpand, '\t') ) )
@@ -2226,7 +2228,7 @@ bool SwTransferable::_PasteSdrFormat(  TransferableDataHelper& rData,
 {
     bool nRet = false;
     SotStorageStreamRef xStrm;
-    if( rData.GetSotStorageStream( SOT_FORMATSTR_ID_DRAWING, xStrm ))
+    if( rData.GetSotStorageStream( SotClipboardFormatId::DRAWING, xStrm ))
     {
         xStrm->SetVersion( SOFFICE_FILEFORMAT_50 );
 
@@ -2248,7 +2250,7 @@ bool SwTransferable::_PasteSdrFormat(  TransferableDataHelper& rData,
 }
 
 bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
-                                sal_uLong nFmt, sal_uInt16 nAction, const Point* pPt,
+                                SotClipboardFormatId nFmt, sal_uInt16 nAction, const Point* pPt,
                                 sal_uInt8 nActionFlags, sal_Int8 nDropAction, bool bNeedToSelectBeforePaste)
 {
     bool nRet = false;
@@ -2259,17 +2261,17 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
 
     switch( nFmt )
     {
-    case SOT_FORMAT_BITMAP:
-    case SOT_FORMATSTR_ID_PNG:
-    case SOT_FORMAT_GDIMETAFILE:
+    case SotClipboardFormatId::BITMAP:
+    case SotClipboardFormatId::PNG:
+    case SotClipboardFormatId::GDIMETAFILE:
         nRet = rData.GetGraphic( nFmt, aGraphic );
         break;
 
-    case SOT_FORMATSTR_ID_SVXB:
+    case SotClipboardFormatId::SVXB:
     {
         SotStorageStreamRef xStm;
 
-        if(rData.GetSotStorageStream(SOT_FORMATSTR_ID_SVXB, xStm))
+        if(rData.GetSotStorageStream(SotClipboardFormatId::SVXB, xStm))
         {
             ReadGraphic( *xStm, aGraphic );
             nRet = (GRAPHIC_NONE != aGraphic.GetType() && GRAPHIC_DEFAULT != aGraphic.GetType());
@@ -2278,19 +2280,19 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
         break;
     }
 
-    case SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK:
-    case SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR:
-    case SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR:
+    case SotClipboardFormatId::NETSCAPE_BOOKMARK:
+    case SotClipboardFormatId::FILEGRPDESCRIPTOR:
+    case SotClipboardFormatId::UNIFORMRESOURCELOCATOR:
         if( ( nRet = rData.GetINetBookmark( nFmt, aBkmk ) ))
         {
             if( SW_PASTESDR_SETATTR == nAction )
-                nFmt = SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK;
+                nFmt = SotClipboardFormatId::NETSCAPE_BOOKMARK;
             else
                 bCheckForGrf = true;
         }
         break;
 
-    case SOT_FORMAT_FILE:
+    case SotClipboardFormatId::FILE:
         {
             OUString sTxt;
             if( ( nRet = rData.GetString( nFmt, sTxt ) ) )
@@ -2320,12 +2322,12 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
                                             aGraphic, &rFlt );
 
         if( !nRet && SW_PASTESDR_SETATTR == nAction &&
-            SOT_FORMAT_FILE == nFmt &&
+            SotClipboardFormatId::FILE == nFmt &&
             // only at frame selection
             rSh.IsFrmSelected() )
         {
             // then set as hyperlink after the graphic
-            nFmt = SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK;
+            nFmt = SotClipboardFormatId::NETSCAPE_BOOKMARK;
             nRet = true;
         }
     }
@@ -2386,7 +2388,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
 
             case SW_PASTESDR_SETATTR:
             {
-                if( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK == nFmt )
+                if( SotClipboardFormatId::NETSCAPE_BOOKMARK == nFmt )
                 {
                     if( rSh.IsFrmSelected() )
                     {
@@ -2465,7 +2467,7 @@ bool SwTransferable::_PasteImageMap( TransferableDataHelper& rData,
                                     SwWrtShell& rSh )
 {
     bool nRet = false;
-    if( rData.HasFormat( SOT_FORMATSTR_ID_SVIM ))
+    if( rData.HasFormat( SotClipboardFormatId::SVIM ))
     {
         SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
         rSh.GetFlyFrmAttr( aSet );
@@ -2474,7 +2476,7 @@ bool SwTransferable::_PasteImageMap( TransferableDataHelper& rData,
 
         // set or replace, that is the question
         ImageMap aImageMap;
-        if( rData.GetImageMap( SOT_FORMATSTR_ID_SVIM, aImageMap ) &&
+        if( rData.GetImageMap( SotClipboardFormatId::SVIM, aImageMap ) &&
             ( !pOld || aImageMap != *pOld ))
         {
             aURL.SetMap( &aImageMap );
@@ -2487,7 +2489,7 @@ bool SwTransferable::_PasteImageMap( TransferableDataHelper& rData,
 }
 
 bool SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData,
-                                        SwWrtShell& rSh, sal_uLong nFmt )
+                                        SwWrtShell& rSh, SotClipboardFormatId nFmt )
 {
     bool nRet = false;
     OUString sFile;
@@ -2531,7 +2533,7 @@ bool SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData,
 }
 
 bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
-                                    SwWrtShell& rSh, sal_uLong nFmt,
+                                    SwWrtShell& rSh, SotClipboardFormatId nFmt,
                                     sal_uInt16 nAction, const Point* pPt,
                     sal_uInt8 nActionFlags, bool /* bMsg */,
                     bool * graphicInserted)
@@ -2628,16 +2630,16 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
 }
 
 bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
-                                    SwWrtShell& rSh, sal_uLong nFmt, bool bLink,
+                                    SwWrtShell& rSh, SotClipboardFormatId nFmt, bool bLink,
                                     const Point* pDragPt, bool bMsg )
 {
     bool nRet = false;
     OUString sTxt;
     if( rData.GetString( nFmt, sTxt ) && !sTxt.isEmpty() )
     {
-        sal_uInt16 nWh = SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE == nFmt
+        sal_uInt16 nWh = SotClipboardFormatId::SBA_CTRLDATAEXCHANGE == nFmt
                     ? 0
-                    : SOT_FORMATSTR_ID_SBA_DATAEXCHANGE == nFmt
+                    : SotClipboardFormatId::SBA_DATAEXCHANGE == nFmt
                                 ? (bLink
                                     ? FN_QRY_MERGE_FIELD
                                     : FN_QRY_INSERT)
@@ -2646,7 +2648,7 @@ bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
                                     : FN_QRY_INSERT_FIELD );
         DataFlavorExVector& rVector = rData.GetDataFlavorExVector();
         bool bHaveColumnDescriptor = OColumnTransferable::canExtractColumnDescriptor(rVector, CTF_COLUMN_DESCRIPTOR | CTF_CONTROL_EXCHANGE);
-        if ( SOT_FORMATSTR_ID_XFORMS == nFmt )
+        if ( SotClipboardFormatId::XFORMS == nFmt )
         {
             rSh.MakeDrawView();
             FmFormView* pFmView = PTR_CAST( FmFormView, rSh.GetDrawView() );
@@ -2728,7 +2730,7 @@ bool SwTransferable::_PasteFileList( TransferableDataHelper& rData,
 {
     bool nRet = false;
     FileList aFileList;
-    if( rData.GetFileList( SOT_FORMAT_FILE_LIST, aFileList ) &&
+    if( rData.GetFileList( SotClipboardFormatId::FILE_LIST, aFileList ) &&
         aFileList.Count() )
     {
         sal_uInt16 nAct = bLink ? SW_PASTESDR_SETATTR : SW_PASTESDR_INSERT;
@@ -2737,10 +2739,10 @@ bool SwTransferable::_PasteFileList( TransferableDataHelper& rData,
         for( sal_uLong n = 0, nEnd = aFileList.Count(); n < nEnd; ++n )
         {
             TransferDataContainer* pHlp = new TransferDataContainer;
-            pHlp->CopyString( FORMAT_FILE, aFileList.GetFile( n ));
+            pHlp->CopyString( SotClipboardFormatId::FILE, aFileList.GetFile( n ));
             TransferableDataHelper aData( pHlp );
 
-            if( SwTransferable::_PasteFileName( aData, rSh, SOT_FORMAT_FILE, nAct,
+            if( SwTransferable::_PasteFileName( aData, rSh, SotClipboardFormatId::FILE, nAct,
                                             pPt, 0, bMsg, 0 ))
             {
                 if( bLink )
@@ -2766,7 +2768,7 @@ bool SwTransferable::_CheckForURLOrLNKFile( TransferableDataHelper& rData,
 {
     bool bIsURLFile = false;
     INetBookmark aBkmk;
-    if( rData.GetINetBookmark( SOT_FORMATSTR_ID_SOLK, aBkmk ) )
+    if( rData.GetINetBookmark( SotClipboardFormatId::SOLK, aBkmk ) )
     {
         rFileName = aBkmk.GetURL();
         if( pTitle )
@@ -2799,16 +2801,16 @@ bool SwTransferable::IsPasteSpecial( const SwWrtShell& rWrtShell,
 
 bool SwTransferable::PasteFormat( SwWrtShell& rSh,
                                     TransferableDataHelper& rData,
-                                    sal_uLong nFormat )
+                                    SotClipboardFormatId nFormat )
 {
     SwWait aWait( *rSh.GetView().GetDocShell(), false );
     bool nRet = false;
 
-    sal_uLong nPrivateFmt = FORMAT_PRIVATE;
+    SotClipboardFormatId nPrivateFmt = SotClipboardFormatId::PRIVATE;
     SwTransferable *pClipboard = GetSwTransferable( rData );
     if( pClipboard &&
         ((TRNSFR_DOCUMENT|TRNSFR_GRAPHIC|TRNSFR_OLE) & pClipboard->eBufferType ))
-        nPrivateFmt = SOT_FORMATSTR_ID_EMBED_SOURCE;
+        nPrivateFmt = SotClipboardFormatId::EMBED_SOURCE;
 
     if( pClipboard && nPrivateFmt == nFormat )
         nRet = pClipboard->PrivatePaste( rSh );
@@ -2840,7 +2842,7 @@ bool SwTransferable::PasteFormat( SwWrtShell& rSh,
 }
 
 bool SwTransferable::_TestAllowedFormat( const TransferableDataHelper& rData,
-                                        sal_uLong nFormat, SotExchangeDest nDestination )
+                                        SotClipboardFormatId nFormat, SotExchangeDest nDestination )
 {
     sal_uInt16 nAction = EXCHG_INOUT_ACTION_NONE, nEventAction;
     if( rData.HasFormat( nFormat )) {
@@ -2859,31 +2861,31 @@ bool SwTransferable::_TestAllowedFormat( const TransferableDataHelper& rData,
  * the list of formats which will be offered to the user in the 'Paste
  * Special...' dialog and the paste button menu
  */
-static sal_uInt16 aPasteSpecialIds[] =
+static SotClipboardFormatId aPasteSpecialIds[] =
 {
-    SOT_FORMATSTR_ID_HTML,
-    SOT_FORMATSTR_ID_HTML_SIMPLE,
-    SOT_FORMATSTR_ID_HTML_NO_COMMENT,
-    FORMAT_RTF,
-    FORMAT_STRING,
-    SOT_FORMATSTR_ID_SONLK,
-    SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK,
-    SOT_FORMATSTR_ID_DRAWING,
-    SOT_FORMATSTR_ID_SVXB,
-    FORMAT_GDIMETAFILE,
-    FORMAT_BITMAP,
-    SOT_FORMATSTR_ID_SVIM,
-    SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR,
-    0
+    SotClipboardFormatId::HTML,
+    SotClipboardFormatId::HTML_SIMPLE,
+    SotClipboardFormatId::HTML_NO_COMMENT,
+    SotClipboardFormatId::RTF,
+    SotClipboardFormatId::STRING,
+    SotClipboardFormatId::SONLK,
+    SotClipboardFormatId::NETSCAPE_BOOKMARK,
+    SotClipboardFormatId::DRAWING,
+    SotClipboardFormatId::SVXB,
+    SotClipboardFormatId::GDIMETAFILE,
+    SotClipboardFormatId::BITMAP,
+    SotClipboardFormatId::SVIM,
+    SotClipboardFormatId::FILEGRPDESCRIPTOR,
+    SotClipboardFormatId::NONE
 };
 
 bool SwTransferable::PasteUnformatted( SwWrtShell& rSh, TransferableDataHelper& rData )
 {
     // Plain text == unformatted
-    return SwTransferable::PasteFormat( rSh, rData, SOT_FORMAT_STRING );
+    return SwTransferable::PasteFormat( rSh, rData, SotClipboardFormatId::STRING );
 }
 
-bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rData, sal_uLong& rFormatUsed )
+bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rData, SotClipboardFormatId& rFormatUsed )
 {
     bool nRet = false;
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
@@ -2912,41 +2914,41 @@ bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rDat
         {
             if( STR_PRIVATEOLE == nResId || STR_PRIVATEGRAPHIC == nResId )
             {
-                // add SOT_FORMATSTR_ID_EMBED_SOURCE to the formats. This
+                // add SotClipboardFormatId::EMBED_SOURCE to the formats. This
                 // format display then the private format name.
                 DataFlavorEx aFlavorEx;
-                aFlavorEx.mnSotId = SOT_FORMATSTR_ID_EMBED_SOURCE;
+                aFlavorEx.mnSotId = SotClipboardFormatId::EMBED_SOURCE;
                 aFormats.insert( aFormats.begin(), aFlavorEx );
             }
             pDlg->SetObjName( pClipboard->aObjDesc.maClassName,
                                 SW_RES( nResId ) );
-            pDlg->Insert( SOT_FORMATSTR_ID_EMBED_SOURCE, aEmptyOUStr );
+            pDlg->Insert( SotClipboardFormatId::EMBED_SOURCE, aEmptyOUStr );
         }
     }
     else
     {
-        if( rData.HasFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ) )
+        if( rData.HasFormat( SotClipboardFormatId::OBJECTDESCRIPTOR ) )
         {
             (void)rData.GetTransferableObjectDescriptor(
-                                SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aDesc );
+                                SotClipboardFormatId::OBJECTDESCRIPTOR, aDesc );
         }
 
-        if( SwTransferable::_TestAllowedFormat( rData, SOT_FORMATSTR_ID_EMBED_SOURCE, nDest ))
-            pDlg->Insert( SOT_FORMATSTR_ID_EMBED_SOURCE, aEmptyOUStr );
-        if( SwTransferable::_TestAllowedFormat( rData, SOT_FORMATSTR_ID_LINK_SOURCE, nDest ))
-            pDlg->Insert( SOT_FORMATSTR_ID_LINK_SOURCE, aEmptyOUStr );
+        if( SwTransferable::_TestAllowedFormat( rData, SotClipboardFormatId::EMBED_SOURCE, nDest ))
+            pDlg->Insert( SotClipboardFormatId::EMBED_SOURCE, aEmptyOUStr );
+        if( SwTransferable::_TestAllowedFormat( rData, SotClipboardFormatId::LINK_SOURCE, nDest ))
+            pDlg->Insert( SotClipboardFormatId::LINK_SOURCE, aEmptyOUStr );
     }
 
-    if( SwTransferable::_TestAllowedFormat( rData, SOT_FORMATSTR_ID_LINK, nDest ))
-        pDlg->Insert( SOT_FORMATSTR_ID_LINK, SW_RES(STR_DDEFORMAT) );
+    if( SwTransferable::_TestAllowedFormat( rData, SotClipboardFormatId::LINK, nDest ))
+        pDlg->Insert( SotClipboardFormatId::LINK, SW_RES(STR_DDEFORMAT) );
 
-    for( sal_uInt16* pIds = aPasteSpecialIds; *pIds; ++pIds )
+    for( SotClipboardFormatId* pIds = aPasteSpecialIds; *pIds != SotClipboardFormatId::NONE; ++pIds )
         if( SwTransferable::_TestAllowedFormat( rData, *pIds, nDest ))
             pDlg->Insert( *pIds, aEmptyOUStr );
 
-    sal_uLong nFormat = pDlg->GetFormat( rData.GetTransferable() );
+    SotClipboardFormatId nFormat = pDlg->GetFormat( rData.GetTransferable() );
 
-    if( nFormat )
+    if( nFormat != SotClipboardFormatId::NONE )
         nRet = SwTransferable::PasteFormat( rSh, rData, nFormat );
 
     if ( nRet )
@@ -2975,26 +2977,26 @@ void SwTransferable::FillClipFmtItem( const SwWrtShell& rSh,
             nResId = 0;
 
         if( nResId )
-            rToFill.AddClipbrdFormat( SOT_FORMATSTR_ID_EMBED_SOURCE,
+            rToFill.AddClipbrdFormat( SotClipboardFormatId::EMBED_SOURCE,
                                         SW_RESSTR( nResId ) );
     }
     else
     {
         TransferableObjectDescriptor aDesc;
-        if (rData.HasFormat(SOT_FORMATSTR_ID_OBJECTDESCRIPTOR))
+        if (rData.HasFormat(SotClipboardFormatId::OBJECTDESCRIPTOR))
         {
             (void)const_cast<TransferableDataHelper&>(rData).GetTransferableObjectDescriptor(
-                                SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aDesc);
+                                SotClipboardFormatId::OBJECTDESCRIPTOR, aDesc);
         }
 
-        if( SwTransferable::_TestAllowedFormat( rData, SOT_FORMATSTR_ID_EMBED_SOURCE, nDest ))
-            rToFill.AddClipbrdFormat( SOT_FORMATSTR_ID_EMBED_SOURCE,
+        if( SwTransferable::_TestAllowedFormat( rData, SotClipboardFormatId::EMBED_SOURCE, nDest ))
+            rToFill.AddClipbrdFormat( SotClipboardFormatId::EMBED_SOURCE,
                                             aDesc.maTypeName );
-        if( SwTransferable::_TestAllowedFormat( rData, SOT_FORMATSTR_ID_LINK_SOURCE, nDest ))
-            rToFill.AddClipbrdFormat( SOT_FORMATSTR_ID_LINK_SOURCE );
+        if( SwTransferable::_TestAllowedFormat( rData, SotClipboardFormatId::LINK_SOURCE, nDest ))
+            rToFill.AddClipbrdFormat( SotClipboardFormatId::LINK_SOURCE );
 
-        SotFormatStringId nFormat;
-        if ( rData.HasFormat(nFormat = SOT_FORMATSTR_ID_EMBED_SOURCE_OLE) || rData.HasFormat(nFormat = SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE) )
+        SotClipboardFormatId nFormat;
+        if ( rData.HasFormat(nFormat = SotClipboardFormatId::EMBED_SOURCE_OLE) || rData.HasFormat(nFormat = SotClipboardFormatId::EMBEDDED_OBJ_OLE) )
         {
             OUString sName,sSource;
             if ( SvPasteObjectHelper::GetEmbeddedName(rData,sName,sSource,nFormat) )
@@ -3002,10 +3004,10 @@ void SwTransferable::FillClipFmtItem( const SwWrtShell& rSh,
         }
     }
 
-    if( SwTransferable::_TestAllowedFormat( rData, SOT_FORMATSTR_ID_LINK, nDest ))
-        rToFill.AddClipbrdFormat( SOT_FORMATSTR_ID_LINK, SW_RESSTR(STR_DDEFORMAT) );
+    if( SwTransferable::_TestAllowedFormat( rData, SotClipboardFormatId::LINK, nDest ))
+        rToFill.AddClipbrdFormat( SotClipboardFormatId::LINK, SW_RESSTR(STR_DDEFORMAT) );
 
-    for( sal_uInt16* pIds = aPasteSpecialIds; *pIds; ++pIds )
+    for( SotClipboardFormatId* pIds = aPasteSpecialIds; *pIds != SotClipboardFormatId::NONE; ++pIds )
         if( SwTransferable::_TestAllowedFormat( rData, *pIds, nDest ))
             rToFill.AddClipbrdFormat( *pIds, aEmptyOUStr );
 }
@@ -3018,23 +3020,23 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
     const int nSelection = pWrtShell->GetSelectionType();
     if( nsSelectionType::SEL_GRF == nSelection)
     {
-        AddFormat( SOT_FORMATSTR_ID_SVXB );
+        AddFormat( SotClipboardFormatId::SVXB );
         const Graphic* pGrf = pWrtShell->GetGraphic();
         if ( pGrf && pGrf->IsSupportedGraphic() )
         {
-            AddFormat( FORMAT_GDIMETAFILE );
-            AddFormat( SOT_FORMATSTR_ID_PNG );
-            AddFormat( FORMAT_BITMAP );
+            AddFormat( SotClipboardFormatId::GDIMETAFILE );
+            AddFormat( SotClipboardFormatId::PNG );
+            AddFormat( SotClipboardFormatId::BITMAP );
         }
         eBufferType = TRNSFR_GRAPHIC;
         pWrtShell->GetGrfNms( &sGrfNm, 0 );
     }
     else if( nsSelectionType::SEL_OLE == nSelection )
     {
-        AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
+        AddFormat( SotClipboardFormatId::EMBED_SOURCE );
         PrepareOLE( aObjDesc );
-        AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
-        AddFormat( FORMAT_GDIMETAFILE );
+        AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+        AddFormat( SotClipboardFormatId::GDIMETAFILE );
         eBufferType = TRNSFR_OLE;
     }
     //Is there anything to provide anyway?
@@ -3055,33 +3057,33 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
         if( nSelection & nsSelectionType::SEL_TBL_CELLS )
             eBufferType = (TransferBufferType)(TRNSFR_TABELLE | eBufferType);
 
-        AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
+        AddFormat( SotClipboardFormatId::EMBED_SOURCE );
 
         //put RTF ahead of the OLE's Metafile for less loss
         if( !pWrtShell->IsObjSelected() )
         {
-            AddFormat( FORMAT_RTF );
-            AddFormat( SOT_FORMATSTR_ID_HTML );
+            AddFormat( SotClipboardFormatId::RTF );
+            AddFormat( SotClipboardFormatId::HTML );
         }
         if( pWrtShell->IsSelection() )
-            AddFormat( FORMAT_STRING );
+            AddFormat( SotClipboardFormatId::STRING );
 
         if( nSelection & ( nsSelectionType::SEL_DRW | nsSelectionType::SEL_DRW_FORM ))
         {
-            AddFormat( SOT_FORMATSTR_ID_DRAWING );
+            AddFormat( SotClipboardFormatId::DRAWING );
             if ( nSelection & nsSelectionType::SEL_DRW )
             {
-                AddFormat( FORMAT_GDIMETAFILE );
-                AddFormat( SOT_FORMATSTR_ID_PNG );
-                AddFormat( FORMAT_BITMAP );
+                AddFormat( SotClipboardFormatId::GDIMETAFILE );
+                AddFormat( SotClipboardFormatId::PNG );
+                AddFormat( SotClipboardFormatId::BITMAP );
             }
             eBufferType = (TransferBufferType)( TRNSFR_GRAPHIC | eBufferType );
 
             pClpGraphic = new Graphic;
-            if( !pWrtShell->GetDrawObjGraphic( FORMAT_GDIMETAFILE, *pClpGraphic ))
+            if( !pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::GDIMETAFILE, *pClpGraphic ))
                 pOrigGrf = pClpGraphic;
             pClpBitmap = new Graphic;
-            if( !pWrtShell->GetDrawObjGraphic( FORMAT_BITMAP, *pClpBitmap ))
+            if( !pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::BITMAP, *pClpBitmap ))
                 pOrigGrf = pClpBitmap;
 
             // is it an URL-Button ?
@@ -3089,12 +3091,12 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
             OUString sDesc;
             if( pWrtShell->GetURLFromButton( sURL, sDesc ) )
             {
-                AddFormat( FORMAT_STRING );
-                 AddFormat( SOT_FORMATSTR_ID_SOLK );
-                 AddFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK );
-                 AddFormat( SOT_FORMATSTR_ID_FILECONTENT );
-                 AddFormat( SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR );
-                 AddFormat( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR );
+                AddFormat( SotClipboardFormatId::STRING );
+                 AddFormat( SotClipboardFormatId::SOLK );
+                 AddFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK );
+                 AddFormat( SotClipboardFormatId::FILECONTENT );
+                 AddFormat( SotClipboardFormatId::FILEGRPDESCRIPTOR );
+                 AddFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR );
                 eBufferType = (TransferBufferType)( TRNSFR_INETFLD | eBufferType );
             }
         }
@@ -3107,7 +3109,7 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
         aObjDesc.maSize = OutputDevice::LogicToLogic( Size( OLESIZE ),
                                                 MAP_TWIP, MAP_100TH_MM );
         PrepareOLE( aObjDesc );
-        AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
+        AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
     }
     else if( nSelection & nsSelectionType::SEL_TXT && !pWrtShell->HasMark() )
     {
@@ -3117,12 +3119,12 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
 
         if( pWrtShell->GetContentAtPos( aPos, aCntntAtPos ) )
         {
-            AddFormat( FORMAT_STRING );
-             AddFormat( SOT_FORMATSTR_ID_SOLK );
-             AddFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK );
-             AddFormat( SOT_FORMATSTR_ID_FILECONTENT );
-             AddFormat( SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR );
-             AddFormat( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR );
+            AddFormat( SotClipboardFormatId::STRING );
+             AddFormat( SotClipboardFormatId::SOLK );
+             AddFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK );
+             AddFormat( SotClipboardFormatId::FILECONTENT );
+             AddFormat( SotClipboardFormatId::FILEGRPDESCRIPTOR );
+             AddFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR );
             eBufferType = TRNSFR_INETFLD;
         }
     }
@@ -3135,14 +3137,14 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
         if( rURL.GetMap() )
         {
             pImageMap = new ImageMap( *rURL.GetMap() );
-            AddFormat( SOT_FORMATSTR_ID_SVIM );
+            AddFormat( SotClipboardFormatId::SVIM );
         }
         else if( !rURL.GetURL().isEmpty() )
         {
             pTargetURL = new INetImage( sGrfNm, rURL.GetURL(),
                                         rURL.GetTargetFrameName(),
                                         aEmptyOUStr, Size() );
-            AddFormat( SOT_FORMATSTR_ID_INET_IMAGE );
+            AddFormat( SotClipboardFormatId::INET_IMAGE );
         }
     }
 }
diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx
index 32f0a0ffa8c4..83c5b8031631 100644
--- a/sw/source/uibase/docvw/edtdd.cxx
+++ b/sw/source/uibase/docvw/edtdd.cxx
@@ -227,7 +227,7 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt )
                                 GetDataFlavorExVector(),
                                 m_nDropDestination,
                                 rEvt.mnAction,
-                                nUserOpt, m_nDropFormat, nEventAction, 0,
+                                nUserOpt, m_nDropFormat, nEventAction, SotClipboardFormatId::NONE,
                                 &rEvt.maDropEvent.Transferable );
 
     TransferableDataHelper aData( rEvt.maDropEvent.Transferable );
@@ -430,9 +430,9 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
                 DND_ACTION_MOVE == rEvt.mnAction )
                 nEventAction = DND_ACTION_COPY;
 
-            if( (SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE == m_nDropFormat &&
+            if( (SotClipboardFormatId::SBA_FIELDDATAEXCHANGE == m_nDropFormat &&
                  EXCHG_IN_ACTION_LINK == m_nDropAction) ||
-                 SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE == m_nDropFormat  )
+                 SotClipboardFormatId::SBA_CTRLDATAEXCHANGE == m_nDropFormat  )
             {
                 SdrMarkView* pMView = PTR_CAST( SdrMarkView, rSh.GetDrawView() );
                 if( pMView && !pMView->IsDesignMode() )
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index ca6dd8b89a65..89bf2736fd2b 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -4960,7 +4960,7 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView):
     m_rView( rMyView ),
 
     m_aActHitType(SDRHIT_NONE),
-    m_nDropFormat( 0 ),
+    m_nDropFormat( SotClipboardFormatId::NONE ),
     m_nDropAction( 0 ),
     m_nDropDestination( SotExchangeDest::NONE ),
 
@@ -5368,7 +5368,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
             if( !aDataHelper.GetXTransferable().is() )
                 break;
 
-            sal_uLong nDropFormat;
+            SotClipboardFormatId nDropFormat;
             sal_uInt16 nEventAction, nDropAction;
             SotExchangeDest nDropDestination;
             nDropDestination = GetDropDestination( rCEvt.GetMousePosPixel() );
diff --git a/sw/source/uibase/globdoc/globdoc.cxx b/sw/source/uibase/globdoc/globdoc.cxx
index 23caf617c53a..22684610461c 100644
--- a/sw/source/uibase/globdoc/globdoc.cxx
+++ b/sw/source/uibase/globdoc/globdoc.cxx
@@ -44,7 +44,7 @@ SwGlobalDocShell::~SwGlobalDocShell()
 }
 
 void SwGlobalDocShell::FillClass( SvGlobalName * pClassName,
-                                   sal_uInt32 * pClipFormat,
+                                   SotClipboardFormatId * pClipFormat,
                                    OUString * /*pAppName*/,
                                    OUString * pLongUserName,
                                    OUString * pUserName,
@@ -54,14 +54,14 @@ void SwGlobalDocShell::FillClass( SvGlobalName * pClassName,
     if (nVersion == SOFFICE_FILEFORMAT_60)
     {
         *pClassName = SvGlobalName( SO3_SWGLOB_CLASSID_60 );
-        *pClipFormat = SOT_FORMATSTR_ID_STARWRITERGLOB_60;
+        *pClipFormat = SotClipboardFormatId::STARWRITERGLOB_60;
         *pLongUserName = SW_RESSTR(STR_WRITER_GLOBALDOC_FULLTYPE);
         OSL_ENSURE( !bTemplate, "No template for Writer Global" );
     }
     else if (nVersion == SOFFICE_FILEFORMAT_8)
     {
         *pClassName     = SvGlobalName( SO3_SWGLOB_CLASSID_60 );
-        *pClipFormat    = bTemplate ? SOT_FORMATSTR_ID_STARWRITERGLOB_8_TEMPLATE : SOT_FORMATSTR_ID_STARWRITERGLOB_8;
+        *pClipFormat    = bTemplate ? SotClipboardFormatId::STARWRITERGLOB_8_TEMPLATE : SotClipboardFormatId::STARWRITERGLOB_8;
         *pLongUserName = SW_RESSTR(STR_WRITER_GLOBALDOC_FULLTYPE);
     }
 
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index 3aeee1963a14..b89b049fdaac 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -108,7 +108,7 @@ friend void     PageNumNotify(  SwViewShell* pVwSh,
 
     int             m_aActHitType;    // current mouse pointer
 
-    sal_uLong       m_nDropFormat;   // format from the last QueryDrop
+    SotClipboardFormatId m_nDropFormat;   // format from the last QueryDrop
     sal_uInt16      m_nDropAction;   // action from the last QueryDrop
     SotExchangeDest m_nDropDestination;  // destination from the last QueryDrop
 
@@ -250,8 +250,8 @@ public:
 
     void            StartExecuteDrag();
     void            DragFinished();
-    sal_uInt16          GetDropAction() const { return m_nDropAction; }
-    sal_uLong           GetDropFormat() const { return m_nDropFormat; }
+    sal_uInt16           GetDropAction() const { return m_nDropAction; }
+    SotClipboardFormatId GetDropFormat() const { return m_nDropFormat; }
 
     Color           GetTextColor() { return m_aTextColor; }
 
diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx
index a11c45014ea2..ec11afc86846 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.hxx
@@ -86,12 +86,12 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
     static bool _CheckForURLOrLNKFile( TransferableDataHelper& rData,
                                 OUString& rFileName, OUString* pTitle = 0 );
     static bool _TestAllowedFormat( const TransferableDataHelper& rData,
-                                        sal_uLong nFormat, SotExchangeDest nDestination );
+                                        SotClipboardFormatId nFormat, SotExchangeDest nDestination );
 
     static bool _PasteFileContent( TransferableDataHelper&,
-                                    SwWrtShell& rSh, sal_uLong nFmt, bool bMsg );
+                                    SwWrtShell& rSh, SotClipboardFormatId nFmt, bool bMsg );
     static bool _PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
-                            sal_uLong nFmt, sal_uInt8 nActionFlags, bool bMsg );
+                            SotClipboardFormatId nFmt, sal_uInt8 nActionFlags, bool bMsg );
     static bool _PasteTargetURL( TransferableDataHelper& rData, SwWrtShell& rSh,
                         sal_uInt16 nAction, const Point* pPt, bool bInsertGRF );
 
@@ -103,21 +103,21 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
                                     const Point* pPt, sal_uInt8 nActionFlags, bool bNeedToSelectBeforePaste);
 
     static bool _PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
-                                sal_uLong nFmt, sal_uInt16 nAction, const Point* pPt,
+                                SotClipboardFormatId nFmt, sal_uInt16 nAction, const Point* pPt,
                                 sal_uInt8 nActionFlags, sal_Int8 nDropAction, bool bNeedToSelectBeforePaste);
 
     static bool _PasteImageMap( TransferableDataHelper& rData,
                                     SwWrtShell& rSh );
 
     static bool _PasteAsHyperlink( TransferableDataHelper& rData,
-                                        SwWrtShell& rSh, sal_uLong nFmt );
+                                        SwWrtShell& rSh, SotClipboardFormatId nFmt );
 
     static bool _PasteFileName( TransferableDataHelper& rData,
-                            SwWrtShell& rSh, sal_uLong nFmt, sal_uInt16 nAction,
+                            SwWrtShell& rSh, SotClipboardFormatId nFmt, sal_uInt16 nAction,
                             const Point* pPt, sal_uInt8 nActionFlags, bool bMsg, bool * graphicInserted );
 
     static bool _PasteDBData( TransferableDataHelper& rData, SwWrtShell& rSh,
-                            sal_uLong nFmt, bool bLink, const Point* pDragPt,
+                            SotClipboardFormatId nFmt, bool bLink, const Point* pDragPt,
                             bool bMsg );
 
     static bool _PasteFileList( TransferableDataHelper& rData,
@@ -138,7 +138,7 @@ protected:
     virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
     virtual bool        WriteObject( SotStorageStreamRef& rxOStm,
                                         void* pUserObject,
-                                        sal_uInt32 nUserObjectId,
+                                        SotClipboardFormatId nUserObjectId,
                                         const css::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
     virtual void        DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE;
     virtual void        ObjectReleased() SAL_OVERRIDE;
@@ -169,7 +169,7 @@ public:
     static bool IsPaste( const SwWrtShell&, const TransferableDataHelper& );
     static bool Paste( SwWrtShell&, TransferableDataHelper& );
     static bool PasteData( TransferableDataHelper& rData,
-                          SwWrtShell& rSh, sal_uInt16 nAction, sal_uLong nFormat,
+                          SwWrtShell& rSh, sal_uInt16 nAction, SotClipboardFormatId nFormat,
                           SotExchangeDest nDestination, bool bIsPasteFmt,
                           bool bIsDefault,
                           const Point* pDDPos = 0, sal_Int8 nDropAction = 0,
@@ -178,9 +178,9 @@ public:
     static bool IsPasteSpecial( const SwWrtShell& rWrtShell,
                                 const TransferableDataHelper& );
     static bool PasteUnformatted( SwWrtShell& rSh, TransferableDataHelper& );
-    static bool PasteSpecial( SwWrtShell& rSh, TransferableDataHelper&, sal_uLong& rFormatUsed );
+    static bool PasteSpecial( SwWrtShell& rSh, TransferableDataHelper&, SotClipboardFormatId& rFormatUsed );
     static bool PasteFormat( SwWrtShell& rSh, TransferableDataHelper& rData,
-                             sal_uLong nFormat );
+                             SotClipboardFormatId nFormat );
 
     static void FillClipFmtItem( const SwWrtShell& rSh,
                                 const TransferableDataHelper& rData,
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index f00737290dd4..2796fb863e27 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -902,16 +902,16 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest &rReq)
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 boost::scoped_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( &rView.GetEditWin() ));
 
-                pDlg->Insert( SOT_FORMAT_STRING, OUString() );
-                pDlg->Insert( SOT_FORMAT_RTF,    OUString() );
+                pDlg->Insert( SotClipboardFormatId::STRING, OUString() );
+                pDlg->Insert( SotClipboardFormatId::RTF,    OUString() );
 
                 TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( &rView.GetEditWin() ) );
 
-                sal_uLong nFormat = pDlg->GetFormat( aDataHelper.GetTransferable() );
+                SotClipboardFormatId nFormat = pDlg->GetFormat( aDataHelper.GetTransferable() );
 
-                if (nFormat > 0)
+                if (nFormat != SotClipboardFormatId::NONE)
                 {
-                    if (nFormat == SOT_FORMAT_STRING)
+                    if (nFormat == SotClipboardFormatId::STRING)
                         pOLV->Paste();
                     else
                         pOLV->PasteSpecial();
@@ -921,17 +921,17 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest &rReq)
         }
         case SID_CLIPBOARD_FORMAT_ITEMS:
         {
-            sal_uLong nFormat = 0;
+            SotClipboardFormatId nFormat = SotClipboardFormatId::NONE;
             const SfxPoolItem* pItem;
             if ( rReq.GetArgs() && rReq.GetArgs()->GetItemState(nSlot, true, &pItem) == SfxItemState::SET &&
                                     pItem->ISA(SfxUInt32Item) )
             {
-                nFormat = static_cast<const SfxUInt32Item*>(pItem)->GetValue();
+                nFormat = static_cast<SotClipboardFormatId>(static_cast<const SfxUInt32Item*>(pItem)->GetValue());
             }
 
-            if ( nFormat )
+            if ( nFormat != SotClipboardFormatId::NONE )
             {
-                if (SOT_FORMAT_STRING == nFormat)
+                if (SotClipboardFormatId::STRING == nFormat)
                     pOLV->Paste();
                 else
                     pOLV->PasteSpecial();
@@ -950,7 +950,7 @@ void SwAnnotationShell::StateClpbrd(SfxItemSet &rSet)
     OutlinerView* pOLV = pPostItMgr->GetActiveSidebarWin()->GetOutlinerView();
 
     TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( &rView.GetEditWin() ) );
-    bool bPastePossible = ( aDataHelper.HasFormat( SOT_FORMAT_STRING ) || aDataHelper.HasFormat( SOT_FORMAT_RTF ) );
+    bool bPastePossible = ( aDataHelper.HasFormat( SotClipboardFormatId::STRING ) || aDataHelper.HasFormat( SotClipboardFormatId::RTF ) );
     bPastePossible = bPastePossible &&  (pPostItMgr->GetActiveSidebarWin()->GetLayoutStatus()!=SwPostItHelper::DELETED);
 
     SfxWhichIter aIter(rSet);
@@ -984,9 +984,9 @@ void SwAnnotationShell::StateClpbrd(SfxItemSet &rSet)
                     if ( bPastePossible )
                     {
                         SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
-                        if ( aDataHelper.HasFormat( SOT_FORMAT_RTF ) )
-                            aFormats.AddClipbrdFormat( SOT_FORMAT_RTF );
-                        aFormats.AddClipbrdFormat( SOT_FORMAT_STRING );
+                        if ( aDataHelper.HasFormat( SotClipboardFormatId::RTF ) )
+                            aFormats.AddClipbrdFormat( SotClipboardFormatId::RTF );
+                        aFormats.AddClipbrdFormat( SotClipboardFormatId::STRING );
                         rSet.Put( aFormats );
                     }
                     else
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index b2dfb85ea231..66cb5f3db872 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -312,7 +312,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
                         SwView* pView = &rView;
 
                         SwTransferable::PasteFormat( rSh, aDataHelper,
-                                        static_cast<const SfxUInt32Item*>(pFmt)->GetValue() );
+                                        static_cast<SotClipboardFormatId>(static_cast<const SfxUInt32Item*>(pFmt)->GetValue()) );
 
                         //Done() has to be called before the shell has been removed
                         rReq.Done();
@@ -344,7 +344,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
                             pViewFrame->GetBindings().GetRecorder();
                         if(xRecorder.is()) {
                             SfxRequest aReq( pViewFrame, SID_CLIPBOARD_FORMAT_ITEMS );
-                            aReq.AppendItem( SfxUInt32Item( SID_CLIPBOARD_FORMAT_ITEMS, SOT_FORMAT_STRING ) );
+                            aReq.AppendItem( SfxUInt32Item( SID_CLIPBOARD_FORMAT_ITEMS, static_cast<sal_uInt32>(SotClipboardFormatId::STRING) ) );
                             aReq.Done();
                         }
                     }
@@ -369,7 +369,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
                     // Temporary variables, because the shell could already be
                     // destroyed after the paste.
                     SwView* pView = &rView;
-                    sal_uLong nFormatId = 0;
+                    SotClipboardFormatId nFormatId = SotClipboardFormatId::NONE;
                     rReq.Ignore();
                     bIgnore = true;
                     if(SwTransferable::PasteSpecial( rSh, aDataHelper, nFormatId ))
@@ -379,7 +379,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
                             pViewFrame->GetBindings().GetRecorder();
                         if(xRecorder.is()) {
                             SfxRequest aReq( pViewFrame, SID_CLIPBOARD_FORMAT_ITEMS );
-                            aReq.AppendItem( SfxUInt32Item( SID_CLIPBOARD_FORMAT_ITEMS, nFormatId ) );
+                            aReq.AppendItem( SfxUInt32Item( SID_CLIPBOARD_FORMAT_ITEMS, static_cast<sal_uInt32>(nFormatId) ) );
                             aReq.Done();
                         }
                     }
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 96f671b2a1db..57fda8308bf8 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3447,13 +3447,13 @@ void NaviContentBookmark::Copy( TransferDataContainer& rData ) const
                     OUStringToOString(aDescr, eSysCSet) + OString(NAVI_BOOKMARK_DELIM) +
                     OString::number(nDefDrag) + OString(NAVI_BOOKMARK_DELIM) +
                     OString::number(nDocSh));
-    rData.CopyByteString(SOT_FORMATSTR_ID_SONLK, sStrBuf);
+    rData.CopyByteString(SotClipboardFormatId::SONLK, sStrBuf);
 }
 
 bool NaviContentBookmark::Paste( TransferableDataHelper& rData )
 {
     OUString sStr;
-    bool bRet = rData.GetString( SOT_FORMATSTR_ID_SONLK, sStr );
+    bool bRet = rData.GetString( SotClipboardFormatId::SONLK, sStr );
     if( bRet )
     {
         sal_Int32 nPos = 0;
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index ae6d50e71bd8..b1bf72faaeb7 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -213,7 +213,7 @@ sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt )
         const SwGlblDocContent* pCnt = pDropEntry ?
                     (const SwGlblDocContent*)pDropEntry->GetUserData() :
                             0;
-        if( aData.HasFormat( FORMAT_FILE_LIST ))
+        if( aData.HasFormat( SotClipboardFormatId::FILE_LIST ))
         {
             nRet = rEvt.mnAction;
             boost::scoped_ptr<SwGlblDocContents> pTempContents(new SwGlblDocContents);
@@ -224,7 +224,7 @@ sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt )
 
             // Get data
             FileList aFileList;
-            aData.GetFileList( FORMAT_FILE_LIST, aFileList );
+            aData.GetFileList( SotClipboardFormatId::FILE_LIST, aFileList );
             for ( size_t n = aFileList.Count(); n--; )
             {
                 sFileName = aFileList.GetFile(n);
@@ -290,15 +290,15 @@ sal_Int8 SwGlobalTree::AcceptDrop( const AcceptDropEvent& rEvt )
             if( pDDSource != pDropEntry )
                 nRet = rEvt.mnAction;
         }
-        else if( IsDropFormatSupported( FORMAT_FILE ) ||
-                  IsDropFormatSupported( FORMAT_STRING ) ||
-                  IsDropFormatSupported( FORMAT_FILE_LIST ) ||
-                  IsDropFormatSupported( SOT_FORMATSTR_ID_SOLK ) ||
-                   IsDropFormatSupported( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK )||
-                   IsDropFormatSupported( SOT_FORMATSTR_ID_FILECONTENT ) ||
-                   IsDropFormatSupported( SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR ) ||
-                   IsDropFormatSupported( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ) ||
-                   IsDropFormatSupported( SOT_FORMATSTR_ID_FILENAME ))
+        else if( IsDropFormatSupported( SotClipboardFormatId::FILE ) ||
+                  IsDropFormatSupported( SotClipboardFormatId::STRING ) ||
+                  IsDropFormatSupported( SotClipboardFormatId::FILE_LIST ) ||
+                  IsDropFormatSupported( SotClipboardFormatId::SOLK ) ||
+                   IsDropFormatSupported( SotClipboardFormatId::NETSCAPE_BOOKMARK )||
+                   IsDropFormatSupported( SotClipboardFormatId::FILECONTENT ) ||
+                   IsDropFormatSupported( SotClipboardFormatId::FILEGRPDESCRIPTOR ) ||
+                   IsDropFormatSupported( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) ||
+                   IsDropFormatSupported( SotClipboardFormatId::FILENAME ))
                 nRet = DND_ACTION_LINK;
 
         if(pEmphasisEntry && pEmphasisEntry != pDropEntry)
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 52ae241f7e9e..b1d03a069bbf 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -1092,24 +1092,24 @@ IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem)
 OUString SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData )
 {
     OUString sFileName;
-    sal_uLong nFmt;
-    if( rData.HasFormat( nFmt = FORMAT_FILE_LIST ))
+    SotClipboardFormatId nFmt;
+    if( rData.HasFormat( nFmt = SotClipboardFormatId::FILE_LIST ))
     {
         FileList aFileList;
         rData.GetFileList( nFmt, aFileList );
         sFileName = aFileList.GetFile( 0 );
     }
-    else if( rData.HasFormat( nFmt = FORMAT_STRING ) ||
-              rData.HasFormat( nFmt = FORMAT_FILE ) ||
-             rData.HasFormat( nFmt = SOT_FORMATSTR_ID_FILENAME ))
+    else if( rData.HasFormat( nFmt = SotClipboardFormatId::STRING ) ||
+              rData.HasFormat( nFmt = SotClipboardFormatId::FILE ) ||
+             rData.HasFormat( nFmt = SotClipboardFormatId::FILENAME ))
     {
         (void)rData.GetString(nFmt, sFileName);
     }
-    else if( rData.HasFormat( nFmt = SOT_FORMATSTR_ID_SOLK ) ||
-                rData.HasFormat( nFmt = SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK )||
-                rData.HasFormat( nFmt = SOT_FORMATSTR_ID_FILECONTENT ) ||
-                rData.HasFormat( nFmt = SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR ) ||
-                rData.HasFormat( nFmt = SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ))
+    else if( rData.HasFormat( nFmt = SotClipboardFormatId::SOLK ) ||
+                rData.HasFormat( nFmt = SotClipboardFormatId::NETSCAPE_BOOKMARK )||
+                rData.HasFormat( nFmt = SotClipboardFormatId::FILECONTENT ) ||
+                rData.HasFormat( nFmt = SotClipboardFormatId::FILEGRPDESCRIPTOR ) ||
+                rData.HasFormat( nFmt = SotClipboardFormatId::UNIFORMRESOURCELOCATOR ))
     {
         INetBookmark aBkmk( aEmptyOUStr, aEmptyOUStr );
         if (rData.GetINetBookmark(nFmt, aBkmk))
@@ -1125,14 +1125,14 @@ OUString SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData )
 sal_Int8 SwNavigationPI::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
 {
     return ( !SwContentTree::IsInDrag() &&
-        ( aContentTree.IsDropFormatSupported( FORMAT_FILE ) ||
-          aContentTree.IsDropFormatSupported( FORMAT_STRING ) ||
-          aContentTree.IsDropFormatSupported( SOT_FORMATSTR_ID_SOLK ) ||
-           aContentTree.IsDropFormatSupported( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK )||
-           aContentTree.IsDropFormatSupported( SOT_FORMATSTR_ID_FILECONTENT ) ||
-           aContentTree.IsDropFormatSupported( SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR ) ||
-           aContentTree.IsDropFormatSupported( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ) ||
-           aContentTree.IsDropFormatSupported( SOT_FORMATSTR_ID_FILENAME )))
+        ( aContentTree.IsDropFormatSupported( SotClipboardFormatId::FILE ) ||
+          aContentTree.IsDropFormatSupported( SotClipboardFormatId::STRING ) ||
+          aContentTree.IsDropFormatSupported( SotClipboardFormatId::SOLK ) ||
+           aContentTree.IsDropFormatSupported( SotClipboardFormatId::NETSCAPE_BOOKMARK )||
+           aContentTree.IsDropFormatSupported( SotClipboardFormatId::FILECONTENT ) ||
+           aContentTree.IsDropFormatSupported( SotClipboardFormatId::FILEGRPDESCRIPTOR ) ||
+           aContentTree.IsDropFormatSupported( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) ||
+           aContentTree.IsDropFormatSupported( SotClipboardFormatId::FILENAME )))
         ? DND_ACTION_COPY
         : DND_ACTION_NONE;
 }
diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx
index 275fbb0b4617..66577679f04e 100644
--- a/sw/source/uibase/web/wdocsh.cxx
+++ b/sw/source/uibase/web/wdocsh.cxx
@@ -62,7 +62,7 @@ SwWebDocShell::~SwWebDocShell()
 }
 
 void SwWebDocShell::FillClass( SvGlobalName * pClassName,
-                                   sal_uInt32 * pClipFormat,
+                                   SotClipboardFormatId * pClipFormat,
                                    OUString * /*pAppName*/,
                                    OUString * pLongUserName,
                                    OUString * pUserName,
@@ -75,13 +75,13 @@ void SwWebDocShell::FillClass( SvGlobalName * pClassName,
     if (nVersion == SOFFICE_FILEFORMAT_60)
     {
         *pClassName = SvGlobalName( SO3_SWWEB_CLASSID_60 );
-        *pClipFormat = SOT_FORMATSTR_ID_STARWRITERWEB_60;
+        *pClipFormat = SotClipboardFormatId::STARWRITERWEB_60;
         *pLongUserName = SW_RESSTR(STR_WRITER_WEBDOC_FULLTYPE);
     }
     else if (nVersion == SOFFICE_FILEFORMAT_8)
     {
         *pClassName     = SvGlobalName( SO3_SWWEB_CLASSID_60 );
-        *pClipFormat    = SOT_FORMATSTR_ID_STARWRITERWEB_8;
+        *pClipFormat    = SotClipboardFormatId::STARWRITERWEB_8;
         *pLongUserName = SW_RESSTR(STR_WRITER_WEBDOC_FULLTYPE);
     }
     *pUserName = SW_RESSTR(STR_HUMAN_SWWEBDOC_NAME);