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

2 files changed, 4 insertions, 4 deletions

diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 062d67e9c2bf..f2f368ad4dc1 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -391,7 +391,7 @@ bool AbstractInsertObjectDialog_Impl::IsCreateNew()
    return pDlg->GetIconIfIconified( pGraphicMediaType );
 }
 
-void AbstractPasteDialog_Impl::Insert( SotFormatStringId nFormat, const OUString & rFormatName )
+void AbstractPasteDialog_Impl::Insert( SotClipboardFormatId nFormat, const OUString & rFormatName )
 {
     pDlg->Insert( nFormat, rFormatName );
 }
@@ -401,7 +401,7 @@ void AbstractPasteDialog_Impl::SetObjName( const SvGlobalName & rClass, const OU
     pDlg->SetObjName( rClass, rObjName );
 }
 
-sal_uLong AbstractPasteDialog_Impl::GetFormat( const TransferableDataHelper& aHelper,
+SotClipboardFormatId AbstractPasteDialog_Impl::GetFormat( const TransferableDataHelper& aHelper,
                         const DataFlavorExVector* pFormats,
                         const TransferableObjectDescriptor* pDesc )
 {
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index da68f13ea245..ffb15778c5e1 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -458,9 +458,9 @@ class AbstractPasteDialog_Impl : public SfxAbstractPasteDialog
 {
 public:
     DECL_ABSTDLG_BASE(AbstractPasteDialog_Impl, SvPasteObjectDialog )
-    virtual void Insert( SotFormatStringId nFormat, const OUString & rFormatName ) SAL_OVERRIDE;
+    virtual void Insert( SotClipboardFormatId nFormat, const OUString & rFormatName ) SAL_OVERRIDE;
     virtual void SetObjName( const SvGlobalName & rClass, const OUString & rObjName ) SAL_OVERRIDE;
-    virtual sal_uLong GetFormat( const TransferableDataHelper& aHelper,
+    virtual SotClipboardFormatId GetFormat( const TransferableDataHelper& aHelper,
                         const DataFlavorExVector* pFormats=0,
                         const TransferableObjectDescriptor* pDesc=0 ) SAL_OVERRIDE;
 };