summaryrefslogtreecommitdiffstats
path: root/sc/source/ui/app/seltrans.cxx
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 /sc/source/ui/app/seltrans.cxx
parentconvert AccessibleStates to enum class (diff)
downloadcore-fb14be5f8f74f83ba89e15f891ddf1f753dcc62f.tar.gz
core-fb14be5f8f74f83ba89e15f891ddf1f753dcc62f.zip
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 'sc/source/ui/app/seltrans.cxx')
-rw-r--r--sc/source/ui/app/seltrans.cxx74
1 files changed, 37 insertions, 37 deletions
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index c965c1d26b2b..6acc11e70234 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -197,62 +197,62 @@ void ScSelectionTransferObj::AddSupportedFormats()
case SC_SELTRANS_CELL:
case SC_SELTRANS_CELLS:
// same formats as in ScTransferObj::AddSupportedFormats
- AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMAT_GDIMETAFILE );
- AddFormat( SOT_FORMATSTR_ID_PNG );
- AddFormat( SOT_FORMAT_BITMAP );
- AddFormat( SOT_FORMATSTR_ID_HTML );
- AddFormat( SOT_FORMATSTR_ID_SYLK );
- AddFormat( SOT_FORMATSTR_ID_LINK );
- AddFormat( SOT_FORMATSTR_ID_DIF );
- AddFormat( SOT_FORMAT_STRING );
- AddFormat( SOT_FORMAT_RTF );
+ AddFormat( SotClipboardFormatId::EMBED_SOURCE );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::GDIMETAFILE );
+ AddFormat( SotClipboardFormatId::PNG );
+ AddFormat( SotClipboardFormatId::BITMAP );
+ AddFormat( SotClipboardFormatId::HTML );
+ AddFormat( SotClipboardFormatId::SYLK );
+ AddFormat( SotClipboardFormatId::LINK );
+ AddFormat( SotClipboardFormatId::DIF );
+ AddFormat( SotClipboardFormatId::STRING );
+ AddFormat( SotClipboardFormatId::RTF );
if ( eMode == SC_SELTRANS_CELL )
- AddFormat( SOT_FORMATSTR_ID_EDITENGINE );
+ AddFormat( SotClipboardFormatId::EDITENGINE );
break;
// different graphic formats as in ScDrawTransferObj::AddSupportedFormats:
case SC_SELTRANS_DRAW_BITMAP:
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMATSTR_ID_SVXB );
- AddFormat( SOT_FORMATSTR_ID_PNG );
- AddFormat( SOT_FORMAT_BITMAP );
- AddFormat( SOT_FORMAT_GDIMETAFILE );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::SVXB );
+ AddFormat( SotClipboardFormatId::PNG );
+ AddFormat( SotClipboardFormatId::BITMAP );
+ AddFormat( SotClipboardFormatId::GDIMETAFILE );
break;
case SC_SELTRANS_DRAW_GRAPHIC:
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMATSTR_ID_SVXB );
- AddFormat( SOT_FORMAT_GDIMETAFILE );
- AddFormat( SOT_FORMATSTR_ID_PNG );
- AddFormat( SOT_FORMAT_BITMAP );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::SVXB );
+ AddFormat( SotClipboardFormatId::GDIMETAFILE );
+ AddFormat( SotClipboardFormatId::PNG );
+ AddFormat( SotClipboardFormatId::BITMAP );
break;
case SC_SELTRANS_DRAW_BOOKMARK:
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMATSTR_ID_SOLK );
- AddFormat( SOT_FORMAT_STRING );
- AddFormat( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR );
- AddFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK );
- AddFormat( SOT_FORMATSTR_ID_DRAWING );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::SOLK );
+ AddFormat( SotClipboardFormatId::STRING );
+ AddFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR );
+ AddFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK );
+ AddFormat( SotClipboardFormatId::DRAWING );
break;
case SC_SELTRANS_DRAW_OLE:
- AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMAT_GDIMETAFILE );
+ AddFormat( SotClipboardFormatId::EMBED_SOURCE );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::GDIMETAFILE );
break;
case SC_SELTRANS_DRAW_OTHER:
// other drawing objects
- AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMATSTR_ID_DRAWING );
- AddFormat( SOT_FORMATSTR_ID_PNG );
- AddFormat( SOT_FORMAT_BITMAP );
- AddFormat( SOT_FORMAT_GDIMETAFILE );
+ AddFormat( SotClipboardFormatId::EMBED_SOURCE );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::DRAWING );
+ AddFormat( SotClipboardFormatId::PNG );
+ AddFormat( SotClipboardFormatId::BITMAP );
+ AddFormat( SotClipboardFormatId::GDIMETAFILE );
break;
default: