create new 'enum class' SotClipboardFormatId to unify types

of which there are several.

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

Change-Id: Ic06d723e404481e3f1bca67c43b70321b764d923

1 files changed, 10 insertions, 10 deletions

diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 9e1e8603d941..d75252df67c2 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -67,10 +67,10 @@ struct ImplBaseLinkData
     struct tClientType
     {
         // applies for all links
-        sal_uIntPtr nCntntType; // Update Format
+        SotClipboardFormatId nCntntType; // Update Format
         // Not Ole-Links
-        bool    bIntrnlLnk;  // It is an internal link
-        sal_uInt16  nUpdateMode; // UpdateMode
+        bool                 bIntrnlLnk;  // It is an internal link
+        sal_uInt16           nUpdateMode; // UpdateMode
     };
 
     struct tDDEType
@@ -84,7 +84,7 @@ struct ImplBaseLinkData
     };
     ImplBaseLinkData()
     {
-        ClientType.nCntntType = 0;
+        ClientType.nCntntType = SotClipboardFormatId::NONE;
         ClientType.bIntrnlLnk = false;
         ClientType.nUpdateMode = 0;
         DDEType.pItem = NULL;
@@ -108,7 +108,7 @@ public:
 #endif
     virtual ~ImplDdeItem();
 
-    virtual DdeData* Get( sal_uIntPtr ) SAL_OVERRIDE;
+    virtual DdeData* Get( SotClipboardFormatId ) SAL_OVERRIDE;
     virtual bool     Put( const DdeData* ) SAL_OVERRIDE;
     virtual void     AdviseLoop( bool ) SAL_OVERRIDE;
 
@@ -135,7 +135,7 @@ SvBaseLink::SvBaseLink()
 
 
 
-SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, sal_uIntPtr nContentType )
+SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, SotClipboardFormatId nContentType )
     : m_bIsReadOnly(false)
 {
     pImpl = new BaseLink_Impl();
@@ -419,16 +419,16 @@ void SvBaseLink::_GetRealObject( bool bConnect)
         Disconnect();
 }
 
-sal_uIntPtr SvBaseLink::GetContentType() const
+SotClipboardFormatId SvBaseLink::GetContentType() const
 {
     if( OBJECT_CLIENT_SO & nObjType )
         return pImplData->ClientType.nCntntType;
 
-    return 0;  // all Formats ?
+    return SotClipboardFormatId::NONE;  // all Formats ?
 }
 
 
-bool SvBaseLink::SetContentType( sal_uIntPtr nType )
+bool SvBaseLink::SetContentType( SotClipboardFormatId nType )
 {
     if( OBJECT_CLIENT_SO & nObjType )
     {
@@ -578,7 +578,7 @@ ImplDdeItem::~ImplDdeItem()
     aRef->Disconnect();
 }
 
-DdeData* ImplDdeItem::Get( sal_uIntPtr nFormat )
+DdeData* ImplDdeItem::Get( SotClipboardFormatId nFormat )
 {
     if( pLink->GetObj() )
     {