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, 5 insertions, 5 deletions

diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index af598c28204d..4ad0774d3ffd 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -1071,7 +1071,7 @@ bool DrawDocShell::SaveAsOwnFormat( SfxMedium& rMedium )
 }
 
 void DrawDocShell::FillClass(SvGlobalName* pClassName,
-                                        sal_uInt32*  pFormat,
+                                        SotClipboardFormatId* pFormat,
                                         OUString* ,
                                         OUString* pFullTypeName,
                                         OUString* pShortTypeName,
@@ -1083,13 +1083,13 @@ void DrawDocShell::FillClass(SvGlobalName* pClassName,
         if ( meDocType == DOCUMENT_TYPE_DRAW )
         {
             *pClassName = SvGlobalName(SO3_SDRAW_CLASSID_60);
-            *pFormat = SOT_FORMATSTR_ID_STARDRAW_60;
+            *pFormat = SotClipboardFormatId::STARDRAW_60;
             *pFullTypeName = OUString(SdResId(STR_GRAPHIC_DOCUMENT_FULLTYPE_60));
         }
         else
         {
             *pClassName = SvGlobalName(SO3_SIMPRESS_CLASSID_60);
-            *pFormat = SOT_FORMATSTR_ID_STARIMPRESS_60;
+            *pFormat = SotClipboardFormatId::STARIMPRESS_60;
             *pFullTypeName = OUString(SdResId(STR_IMPRESS_DOCUMENT_FULLTYPE_60));
         }
     }
@@ -1098,13 +1098,13 @@ void DrawDocShell::FillClass(SvGlobalName* pClassName,
         if ( meDocType == DOCUMENT_TYPE_DRAW )
         {
             *pClassName = SvGlobalName(SO3_SDRAW_CLASSID_60);
-            *pFormat = bTemplate ? SOT_FORMATSTR_ID_STARDRAW_8_TEMPLATE : SOT_FORMATSTR_ID_STARDRAW_8;
+            *pFormat = bTemplate ? SotClipboardFormatId::STARDRAW_8_TEMPLATE : SotClipboardFormatId::STARDRAW_8;
             *pFullTypeName = "Draw 8"; // HACK: method will be removed with new storage API
         }
         else
         {
             *pClassName = SvGlobalName(SO3_SIMPRESS_CLASSID_60);
-            *pFormat = bTemplate ? SOT_FORMATSTR_ID_STARIMPRESS_8_TEMPLATE : SOT_FORMATSTR_ID_STARIMPRESS_8;
+            *pFormat = bTemplate ? SotClipboardFormatId::STARIMPRESS_8_TEMPLATE : SotClipboardFormatId::STARIMPRESS_8;
             *pFullTypeName = "Impress 8"; // HACK: method will be removed with new storage API
         }
     }