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

5 files changed, 13 insertions, 13 deletions

diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 03e867c2eca4..0a0c09d23059 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -186,7 +186,7 @@ public:
                     GetUndoManager() SAL_OVERRIDE;
 
     virtual void    FillClass( SvGlobalName * pClassName,
-                               sal_uInt32 * pFormat,
+                               SotClipboardFormatId * pFormat,
                                OUString * pAppName,
                                OUString * pFullTypeName,
                                OUString * pShortTypeName,
diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx
index f56bd95c2252..8f5642b2a59c 100644
--- a/sc/source/ui/inc/drwtrans.hxx
+++ b/sc/source/ui/inc/drwtrans.hxx
@@ -76,7 +76,7 @@ public:
 
     virtual void        AddSupportedFormats() SAL_OVERRIDE;
     virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
-    virtual bool        WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId,
+    virtual bool        WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId,
                                         const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
     virtual void        ObjectReleased() SAL_OVERRIDE;
     virtual void        DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index f5b7b8c1bc11..e311e15f8141 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -110,7 +110,7 @@ public:
 
     SC_DLLPUBLIC static void EmbeddedNullTreatment( OUString & rStr );
 
-    static bool  IsFormatSupported( sal_uLong nFormat );
+    static bool  IsFormatSupported( SotClipboardFormatId nFormat );
     static const sal_Unicode* ScanNextFieldFromString( const sal_Unicode* p,
             OUString& rField, sal_Unicode cStr, const sal_Unicode* pSeps,
             bool bMergeSeps, bool& rbIsQuoted, bool& rbOverflowCell );
@@ -135,12 +135,12 @@ public:
     void            SetStreamPath( const OUString& rPath ) { aStreamPath = rPath; }
     const OUString& GetStreamPath() const { return aStreamPath; }
 
-    bool ImportString( const OUString&, sal_uLong=FORMAT_STRING );
-    bool ExportString( OUString&, sal_uLong=FORMAT_STRING );
-    bool ExportByteString( OString&, rtl_TextEncoding, sal_uLong=FORMAT_STRING );
+    bool ImportString( const OUString&, SotClipboardFormatId=SotClipboardFormatId::STRING );
+    bool ExportString( OUString&, SotClipboardFormatId=SotClipboardFormatId::STRING );
+    bool ExportByteString( OString&, rtl_TextEncoding, SotClipboardFormatId=SotClipboardFormatId::STRING );
 
-    bool ImportStream( SvStream&, const OUString& rBaseURL, sal_uLong=FORMAT_STRING );
-    bool ExportStream( SvStream&, const OUString& rBaseURL, sal_uLong=FORMAT_STRING );
+    bool ImportStream( SvStream&, const OUString& rBaseURL, SotClipboardFormatId=SotClipboardFormatId::STRING );
+    bool ExportStream( SvStream&, const OUString& rBaseURL, SotClipboardFormatId=SotClipboardFormatId::STRING );
 
     bool ImportData( const OUString& rMimeType,
                      const ::com::sun::star::uno::Any & rValue );
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index bd11836bcf97..57d8ea6f8954 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -73,7 +73,7 @@ public:
 
     virtual void        AddSupportedFormats() SAL_OVERRIDE;
     virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
-    virtual bool        WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId,
+    virtual bool        WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId,
                                         const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
     virtual void        ObjectReleased() SAL_OVERRIDE;
     virtual void        DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 70c7e0f8df4b..a032722ff9a5 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -111,10 +111,10 @@ public:
                                     InsertDeleteFlags nUndoExtraFlags = IDF_NONE,
                                     bool bAllowDialogs = false );
 
-    void            FillTab( InsertDeleteFlags nFlags, sal_uInt16 nFunction, bool bSkipEmpty, bool bAsLink );
+    void                        FillTab( InsertDeleteFlags nFlags, sal_uInt16 nFunction, bool bSkipEmpty, bool bAsLink );
 
     SC_DLLPUBLIC void           PasteFromSystem();
-    SC_DLLPUBLIC bool           PasteFromSystem( sal_uLong nFormatId, bool bApi = false );
+    SC_DLLPUBLIC bool           PasteFromSystem( SotClipboardFormatId nFormatId, bool bApi = false );
     void                        PasteFromTransferable( const ::com::sun::star::uno::Reference<
                                                        ::com::sun::star::datatransfer::XTransferable >& rxTransferable );
 
@@ -126,7 +126,7 @@ public:
                         const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable,
                         SdrObject& rHitObj);
 
-    bool            PasteDataFormat( sal_uLong nFormatId,
+    bool            PasteDataFormat( SotClipboardFormatId nFormatId,
                                         const ::com::sun::star::uno::Reference<
                                             ::com::sun::star::datatransfer::XTransferable >& rxTransferable,
                                         SCCOL nPosX, SCROW nPosY, Point* pLogicPos = NULL,
@@ -138,7 +138,7 @@ public:
     bool            PasteMetaFile( const Point&, const GDIMetaFile& );
     bool            PasteGraphic( const Point& rPos, const Graphic& rGraphic,
                                     const OUString& rFile, const OUString& rFilter );
-    bool            PasteBookmark( sal_uLong nFormatId,
+    bool            PasteBookmark( SotClipboardFormatId nFormatId,
                                 const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::datatransfer::XTransferable >& rxTransferable,
                                 SCCOL nPosX, SCROW nPosY );