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

7 files changed, 21 insertions, 21 deletions

diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 843347b95c05..13fe8351ece6 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -219,7 +219,7 @@ void HexColorControl::Paste()
         if ( xDataObj.is() )
         {
             ::com::sun::star::datatransfer::DataFlavor aFlavor;
-            SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aFlavor );
+            SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aFlavor );
             try
             {
                 ::com::sun::star::uno::Any aData = xDataObj->getTransferData( aFlavor );
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index ec4a270b9e2a..c8e4683b2fa5 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -48,7 +48,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxHyperURLBox(vcl::Wi
 
 sal_Int8 SvxHyperURLBox::AcceptDrop( const AcceptDropEvent& /* rEvt */ )
 {
-    return IsDropFormatSupported( FORMAT_STRING ) ? DND_ACTION_COPY : DND_ACTION_NONE;
+    return IsDropFormatSupported( SotClipboardFormatId::STRING ) ? DND_ACTION_COPY : DND_ACTION_NONE;
 }
 
 sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent& rEvt )
@@ -57,7 +57,7 @@ sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent& rEvt )
     OUString                aString;
     sal_Int8                nRet = DND_ACTION_NONE;
 
-    if( aDataHelper.GetString( FORMAT_STRING, aString ) )
+    if( aDataHelper.GetString( SotClipboardFormatId::STRING, aString ) )
     {
         SetText( aString );
         nRet = DND_ACTION_COPY;
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 0ce111ffdce0..a7478f5c23df 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -86,28 +86,28 @@ SvPasteObjectDialog::~SvPasteObjectDialog()
 /*************************************************************************
 |*    SvPasteObjectDialog::Insert()
 *************************************************************************/
-void SvPasteObjectDialog::Insert( SotFormatStringId nFormat, const OUString& rFormatName )
+void SvPasteObjectDialog::Insert( SotClipboardFormatId nFormat, const OUString& rFormatName )
 {
     aSupplementMap.insert( ::std::make_pair( nFormat, rFormatName ) );
 }
 
-sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
+SotClipboardFormatId SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
                                       const DataFlavorExVector* pFormats,
                                       const TransferableObjectDescriptor* )
 {
     //TODO/LATER: why is the Descriptor never used?!
     TransferableObjectDescriptor aDesc;
-    if (rHelper.HasFormat(SOT_FORMATSTR_ID_OBJECTDESCRIPTOR))
+    if (rHelper.HasFormat(SotClipboardFormatId::OBJECTDESCRIPTOR))
     {
         (void)const_cast<TransferableDataHelper&>(rHelper).GetTransferableObjectDescriptor(
-                                SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aDesc);
+                                SotClipboardFormatId::OBJECTDESCRIPTOR, aDesc);
     }
     if ( !pFormats )
         pFormats = &rHelper.GetDataFlavorExVector();
 
     // create and fill dialog box
     OUString aSourceName, aTypeName;
-    sal_uLong nSelFormat = 0;
+    SotClipboardFormatId nSelFormat = SotClipboardFormatId::NONE;
     SvGlobalName aEmptyNm;
 
     ObjectLB().SetUpdateMode( false );
@@ -117,9 +117,9 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
     while( aIter != aEnd )
     {
         ::com::sun::star::datatransfer::DataFlavor aFlavor( *aIter );
-        SotFormatStringId nFormat = (*aIter++).mnSotId;
+        SotClipboardFormatId nFormat = (*aIter++).mnSotId;
 
-        ::std::map< SotFormatStringId, OUString >::iterator itName =
+        ::std::map< SotClipboardFormatId, OUString >::iterator itName =
             aSupplementMap.find( nFormat );
 
         // if there is an "Embed Source" or and "Embedded Object" on the
@@ -143,7 +143,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
         {
             aName = *pName;
 
-            if( SOT_FORMATSTR_ID_EMBED_SOURCE == nFormat )
+            if( SotClipboardFormatId::EMBED_SOURCE == nFormat )
             {
                 if( aDesc.maClassName != aEmptyNm )
                 {
@@ -155,7 +155,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
                         aName = aTypeName = aDesc.maTypeName;
                 }
             }
-            else if( SOT_FORMATSTR_ID_LINK_SOURCE == nFormat )
+            else if( SotClipboardFormatId::LINK_SOURCE == nFormat )
             {
                 continue;
             }
@@ -201,7 +201,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
 
     if( Dialog::Execute() == RET_OK )
     {
-        nSelFormat  = reinterpret_cast<sal_uLong>(ObjectLB().GetSelectEntryData());
+        nSelFormat = static_cast<SotClipboardFormatId>(reinterpret_cast<sal_uLong>(ObjectLB().GetSelectEntryData()));
     }
 
     return nSelFormat;
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;
 };
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index c7b815f764cb..52332ac398ed 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -42,7 +42,7 @@ class SvPasteObjectDialog : public ModalDialog
     FixedText* m_pFtObjectSource;
     ListBox* m_pLbInsertList;
     OKButton* m_pOKButton;
-    ::std::map< SotFormatStringId, OUString > aSupplementMap;
+    ::std::map< SotClipboardFormatId, OUString > aSupplementMap;
     SvGlobalName    aObjClassName;
     OUString        aObjName;
 
@@ -57,9 +57,9 @@ public:
                 SvPasteObjectDialog( vcl::Window* pParent );
                 virtual ~SvPasteObjectDialog();
 
-    void        Insert( SotFormatStringId nFormat, const OUString & rFormatName );
+    void        Insert( SotClipboardFormatId nFormat, const OUString & rFormatName );
     void        SetObjName( const SvGlobalName & rClass, const OUString & rObjName );
-    sal_uLong       GetFormat( const TransferableDataHelper& aHelper,
+    SotClipboardFormatId GetFormat( const TransferableDataHelper& aHelper,
                         const DataFlavorExVector* pFormats=0,
                         const TransferableObjectDescriptor* pDesc=0 );
 };
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 849faa8b8006..95ecf0505770 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2313,7 +2313,7 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const
                 nEncode));
             sData.append(aLineEnd);
         }
-        pCntnr->CopyByteString( SOT_FORMAT_STRING, sData.makeStringAndClear() );
+        pCntnr->CopyByteString( SotClipboardFormatId::STRING, sData.makeStringAndClear() );
         pCntnr->CopyToClipboard( (vcl::Window*)this );
     }
 }