From fb14be5f8f74f83ba89e15f891ddf1f753dcc62f Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 12 Mar 2015 14:53:28 +0200
Subject: 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
---
 svl/source/svdde/ddedata.cxx      | 12 ++++++------
 svl/source/svdde/ddesvr.cxx       |  2 +-
 svl/unx/source/svdde/ddedummy.cxx | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'svl')

diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx
index d7568543485e..070bde18ca85 100644
--- a/svl/source/svdde/ddedata.cxx
+++ b/svl/source/svdde/ddedata.cxx
@@ -117,13 +117,13 @@ sal_uLong DdeData::GetExternalFormat( sal_uLong nFmt )
 {
     switch( nFmt )
     {
-    case FORMAT_STRING:
+    case SotClipboardFormatId::STRING:
         nFmt = CF_TEXT;
         break;
-    case FORMAT_BITMAP:
+    case SotClipboardFormatId::BITMAP:
         nFmt = CF_BITMAP;
         break;
-    case FORMAT_GDIMETAFILE:
+    case SotClipboardFormatId::GDIMETAFILE:
         nFmt = CF_METAFILEPICT;
         break;
 
@@ -144,15 +144,15 @@ sal_uLong DdeData::GetInternalFormat( sal_uLong nFmt )
     switch( nFmt )
     {
     case CF_TEXT:
-        nFmt = FORMAT_STRING;
+        nFmt = SotClipboardFormatId::STRING;
         break;
 
     case CF_BITMAP:
-        nFmt = FORMAT_BITMAP;
+        nFmt = SotClipboardFormatId::BITMAP;
         break;
 
     case CF_METAFILEPICT:
-        nFmt = FORMAT_GDIMETAFILE;
+        nFmt = SotClipboardFormatId::GDIMETAFILE;
         break;
 
     default:
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 952dfe9fb6b5..984d899fc598 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -477,7 +477,7 @@ DdeService::DdeService( const OUString& rService )
             nStatus = DMLERR_SYS_ERROR;
         }
     }
-    AddFormat( FORMAT_STRING );
+    AddFormat( SotClipboardFormatId::STRING );
     pSysTopic = new DdeTopic( reinterpret_cast<const sal_Unicode*>(SZDDESYS_TOPIC) );
     pSysTopic->AddItem( DdeItem( reinterpret_cast<const sal_Unicode*>(SZDDESYS_ITEM_TOPICS) ) );
     pSysTopic->AddItem( DdeItem( reinterpret_cast<const sal_Unicode*>(SZDDESYS_ITEM_SYSITEMS) ) );
diff --git a/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx
index 33600249c321..d53594eb41f5 100644
--- a/svl/unx/source/svdde/ddedummy.cxx
+++ b/svl/unx/source/svdde/ddedummy.cxx
@@ -35,7 +35,7 @@ DdeData::DdeData( const DdeData& )
 {
 }
 
-DdeData::DdeData( const void*, long, sal_uLong)
+DdeData::DdeData( const void*, long, SotClipboardFormatId)
     : pImp(NULL)
 {
 }
@@ -44,13 +44,13 @@ DdeData::~DdeData()
 {
 }
 
-void DdeData::SetFormat( SAL_UNUSED_PARAMETER sal_uLong )
+void DdeData::SetFormat( SAL_UNUSED_PARAMETER SotClipboardFormatId )
 {
 }
 
-sal_uLong DdeData::GetFormat() const
+SotClipboardFormatId DdeData::GetFormat() const
 {
-    return 0L;
+    return SotClipboardFormatId::NONE;
 }
 
 DdeData& DdeData::operator = ( const DdeData& )
@@ -319,7 +319,7 @@ DdeGetPutItem::DdeGetPutItem( const DdeItem& rItem )
 {
 }
 
-DdeData* DdeGetPutItem::Get( SAL_UNUSED_PARAMETER sal_uLong )
+DdeData* DdeGetPutItem::Get( SAL_UNUSED_PARAMETER SotClipboardFormatId )
 {
     return NULL;
 }
-- 
cgit