summaryrefslogtreecommitdiff
path: root/svl/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-12 14:53:28 +0200
committerNoel Grandin <noel@peralex.com>2015-03-18 14:23:50 +0200
commitfb14be5f8f74f83ba89e15f891ddf1f753dcc62f (patch)
treebeaa4af08b0c3d75bf6e40b21b96c55e0ac1c60a /svl/source
parentb8ce52aab9459773544f1696cfe6b7b6f171a389 (diff)
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
Diffstat (limited to 'svl/source')
-rw-r--r--svl/source/svdde/ddedata.cxx12
-rw-r--r--svl/source/svdde/ddesvr.cxx2
2 files changed, 7 insertions, 7 deletions
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) ) );