convert CTF_ constants to scoped enum

Change-Id: I1c8149e9fccde761bb2a5fd2cf3cddcd2d9748dd

10 files changed, 47 insertions, 40 deletions

diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index fad16daabc0b..e8c728fffdf2 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -1164,7 +1164,7 @@ void SbaGridControl::DoColumnDrag(sal_uInt16 nColumnPos)
     if (sField.isEmpty())
         return;
 
-    OColumnTransferable* pDataTransfer = new OColumnTransferable(xDataSource, sField, xAffectedField, xActiveConnection, CTF_FIELD_DESCRIPTOR | CTF_COLUMN_DESCRIPTOR);
+    OColumnTransferable* pDataTransfer = new OColumnTransferable(xDataSource, sField, xAffectedField, xActiveConnection, ColumnTransferFormatFlags::FIELD_DESCRIPTOR | ColumnTransferFormatFlags::COLUMN_DESCRIPTOR);
     Reference< XTransferable > xEnsureDelete = pDataTransfer;
     pDataTransfer->StartDrag(this, DND_ACTION_COPY | DND_ACTION_LINK);
 }
diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx
index 68bd1ebba220..fccf29d097b8 100644
--- a/include/svx/dbaexchange.hxx
+++ b/include/svx/dbaexchange.hxx
@@ -28,14 +28,21 @@
 #include <svx/svxdllapi.h>
 
 
-namespace svx
+// column transfer formats
+enum class ColumnTransferFormatFlags
 {
+    FIELD_DESCRIPTOR        = 0x01,    // the field descriptor format
+    CONTROL_EXCHANGE        = 0x02,    // the control exchange format
+    COLUMN_DESCRIPTOR       = 0x04,    // data access descriptor for a column
+};
+namespace o3tl
+{
+    template<> struct typed_flags<ColumnTransferFormatFlags> : is_typed_flags<ColumnTransferFormatFlags, 0x07> {};
+}
 
 
-// column transfer formats
-#define CTF_FIELD_DESCRIPTOR        0x0001      // the field descriptor format
-#define CTF_CONTROL_EXCHANGE        0x0002      // the control exchange format
-#define CTF_COLUMN_DESCRIPTOR       0x0004      // data access descriptor for a column
+namespace svx
+{
 
 
     //= OColumnTransferable
@@ -43,9 +50,9 @@ namespace svx
     class SVX_DLLPUBLIC SAL_WARN_UNUSED OColumnTransferable : public TransferableHelper
     {
     protected:
-        ODataAccessDescriptor   m_aDescriptor;
-        OUString         m_sCompatibleFormat;
-        sal_Int32               m_nFormatFlags;
+        ODataAccessDescriptor      m_aDescriptor;
+        OUString                   m_sCompatibleFormat;
+        ColumnTransferFormatFlags  m_nFormatFlags;
 
     public:
         /** construct the transferable
@@ -56,7 +63,7 @@ namespace svx
             ,const sal_Int32        _nCommandType
             ,const OUString& _rCommand
             ,const OUString& _rFieldName
-            ,sal_Int32  _nFormats
+            ,ColumnTransferFormatFlags  _nFormats
         );
 
         /** construct the transferable from a data access descriptor
@@ -75,7 +82,7 @@ namespace svx
         */
         OColumnTransferable(
             const ODataAccessDescriptor& _rDescriptor,
-            sal_Int32                    _nFormats
+            ColumnTransferFormatFlags    _nFormats
         );
 
         /** construct the transferable from a DatabaseForm component and a field name
@@ -104,7 +111,7 @@ namespace svx
             const OUString& _rFieldName,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn,
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
-            sal_Int32   _nFormats
+            ColumnTransferFormatFlags  _nFormats
         );
 
         /** checks whether or not a column descriptor can be extracted from the data flavor vector given
@@ -113,7 +120,7 @@ namespace svx
             @param _nFormats
                 formats to accept
         */
-        static bool canExtractColumnDescriptor(const DataFlavorExVector& _rFlavors, sal_Int32 _nFormats);
+        static bool canExtractColumnDescriptor(const DataFlavorExVector& _rFlavors, ColumnTransferFormatFlags _nFormats);
 
         /** extracts a column descriptor from the transferable given
         */
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 7d31fa225538..a01b1c2fa5bc 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -767,7 +767,7 @@ sal_Int8 OReportSection::AcceptDrop( const AcceptDropEvent& _rEvt )
     {
         const DataFlavorExVector& rFlavors = GetDataFlavorExVector();
         if (   ::svx::OMultiColumnTransferable::canExtractDescriptor(rFlavors)
-            || ::svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, CTF_FIELD_DESCRIPTOR | CTF_CONTROL_EXCHANGE | CTF_COLUMN_DESCRIPTOR) )
+            || ::svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, ColumnTransferFormatFlags::FIELD_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE | ColumnTransferFormatFlags::COLUMN_DESCRIPTOR) )
             return _rEvt.mnAction;
 
         const sal_Int8 nDropOption = ( OReportExchange::canExtract(rFlavors) ) ? DND_ACTION_COPYMOVE : DND_ACTION_NONE;
@@ -799,7 +799,7 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt )
         m_pParent->getViewsWindow()->unmarkAllObjects(m_pView);
     }
     else if ( bMultipleFormat
-        || ::svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, CTF_FIELD_DESCRIPTOR | CTF_CONTROL_EXCHANGE | CTF_COLUMN_DESCRIPTOR) )
+        || ::svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, ColumnTransferFormatFlags::FIELD_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE | ColumnTransferFormatFlags::COLUMN_DESCRIPTOR) )
     {
         m_pParent->getViewsWindow()->getView()->setMarked(m_pView, true);
         m_pView->UnmarkAll();
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 5a94790542f7..a7e4052576e9 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -416,7 +416,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
     {
         //  insert database field control
 
-        if ( ::svx::OColumnTransferable::canExtractColumnDescriptor( aDataHelper.GetDataFlavorExVector(), CTF_COLUMN_DESCRIPTOR | CTF_CONTROL_EXCHANGE ) )
+        if ( ::svx::OColumnTransferable::canExtractColumnDescriptor( aDataHelper.GetDataFlavorExVector(), ColumnTransferFormatFlags::COLUMN_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE ) )
         {
             MakeDrawLayer();
             ScDrawView* pScDrawView = GetScDrawView();
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 889173374c23..570177f3fe02 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -48,14 +48,14 @@ namespace svx
                                             ,const sal_Int32        _nCommandType
                                             ,const OUString& _rCommand
                                             ,const OUString& _rFieldName
-                                            ,sal_Int32  _nFormats)
+                                            ,ColumnTransferFormatFlags _nFormats)
         :m_nFormatFlags(_nFormats)
     {
         implConstruct(_rDatasource,_rConnectionResource,_nCommandType, _rCommand, _rFieldName);
     }
 
 
-    OColumnTransferable::OColumnTransferable(const ODataAccessDescriptor& _rDescriptor, sal_Int32 _nFormats )
+    OColumnTransferable::OColumnTransferable(const ODataAccessDescriptor& _rDescriptor, ColumnTransferFormatFlags _nFormats )
         :m_nFormatFlags(_nFormats)
     {
         OUString sDataSource, sDatabaseLocation, sConnectionResource, sCommand, sFieldName;
@@ -73,7 +73,7 @@ namespace svx
             sDataSource.isEmpty() ? sDatabaseLocation : sDataSource,
             sConnectionResource, nCommandType, sCommand, sFieldName );
 
-        if ( m_nFormatFlags & CTF_COLUMN_DESCRIPTOR )
+        if ( m_nFormatFlags & ColumnTransferFormatFlags::COLUMN_DESCRIPTOR )
         {
             if ( _rDescriptor.has( daConnection ) )
                 m_aDescriptor[ daConnection ] = _rDescriptor[ daConnection ];
@@ -85,7 +85,7 @@ namespace svx
 
     OColumnTransferable::OColumnTransferable(const Reference< XPropertySet >& _rxForm,
             const OUString& _rFieldName, const Reference< XPropertySet >& _rxColumn,
-            const Reference< XConnection >& _rxConnection, sal_Int32 _nFormats)
+            const Reference< XConnection >& _rxConnection, ColumnTransferFormatFlags _nFormats)
         :m_nFormatFlags(_nFormats)
     {
         OSL_ENSURE(_rxForm.is(), "OColumnTransferable::OColumnTransferable: invalid form!");
@@ -139,7 +139,7 @@ namespace svx
 
         implConstruct(sDatasource, sURL,nCommandType, sCommand, _rFieldName);
 
-        if ((m_nFormatFlags & CTF_COLUMN_DESCRIPTOR) == CTF_COLUMN_DESCRIPTOR)
+        if ((m_nFormatFlags & ColumnTransferFormatFlags::COLUMN_DESCRIPTOR) == ColumnTransferFormatFlags::COLUMN_DESCRIPTOR)
         {
             if (_rxColumn.is())
                 m_aDescriptor[daColumnObject] <<= _rxColumn;
@@ -194,7 +194,7 @@ namespace svx
         m_sCompatibleFormat += _rFieldName;
 
         m_aDescriptor.clear();
-        if ((m_nFormatFlags & CTF_COLUMN_DESCRIPTOR) == CTF_COLUMN_DESCRIPTOR)
+        if ((m_nFormatFlags & ColumnTransferFormatFlags::COLUMN_DESCRIPTOR) == ColumnTransferFormatFlags::COLUMN_DESCRIPTOR)
         {
             m_aDescriptor.setDataSource(_rDatasource);
             if ( !_rConnectionResource.isEmpty() )
@@ -209,13 +209,13 @@ namespace svx
 
     void OColumnTransferable::AddSupportedFormats()
     {
-        if (CTF_CONTROL_EXCHANGE & m_nFormatFlags)
+        if (ColumnTransferFormatFlags::CONTROL_EXCHANGE & m_nFormatFlags)
             AddFormat(SotClipboardFormatId::SBA_CTRLDATAEXCHANGE);
 
-        if (CTF_FIELD_DESCRIPTOR & m_nFormatFlags)
+        if (ColumnTransferFormatFlags::FIELD_DESCRIPTOR & m_nFormatFlags)
             AddFormat(SotClipboardFormatId::SBA_FIELDDATAEXCHANGE);
 
-        if (CTF_COLUMN_DESCRIPTOR & m_nFormatFlags)
+        if (ColumnTransferFormatFlags::COLUMN_DESCRIPTOR & m_nFormatFlags)
             AddFormat(getDescriptorFormatId());
     }
 
@@ -237,11 +237,11 @@ namespace svx
     }
 
 
-    bool OColumnTransferable::canExtractColumnDescriptor(const DataFlavorExVector& _rFlavors, sal_Int32 _nFormats)
+    bool OColumnTransferable::canExtractColumnDescriptor(const DataFlavorExVector& _rFlavors, ColumnTransferFormatFlags _nFormats)
     {
-        bool bFieldFormat       = 0 != (_nFormats & CTF_FIELD_DESCRIPTOR);
-        bool bControlFormat     = 0 != (_nFormats & CTF_CONTROL_EXCHANGE);
-        bool bDescriptorFormat  = 0 != (_nFormats & CTF_COLUMN_DESCRIPTOR);
+        bool bFieldFormat       = bool(_nFormats & ColumnTransferFormatFlags::FIELD_DESCRIPTOR);
+        bool bControlFormat     = bool(_nFormats & ColumnTransferFormatFlags::CONTROL_EXCHANGE);
+        bool bDescriptorFormat  = bool(_nFormats & ColumnTransferFormatFlags::COLUMN_DESCRIPTOR);
         for (   DataFlavorExVector::const_iterator aCheck = _rFlavors.begin();
                 aCheck != _rFlavors.end();
                 ++aCheck
@@ -361,13 +361,13 @@ namespace svx
         OSL_ENSURE( _pContainer, "OColumnTransferable::addDataToContainer: invalid container!" );
         if ( _pContainer )
         {
-            if ( m_nFormatFlags & CTF_FIELD_DESCRIPTOR )
+            if ( m_nFormatFlags & ColumnTransferFormatFlags::FIELD_DESCRIPTOR )
                 _pContainer->CopyAny( SotClipboardFormatId::SBA_FIELDDATAEXCHANGE, makeAny( m_sCompatibleFormat ) );
 
-            if ( m_nFormatFlags & CTF_CONTROL_EXCHANGE )
+            if ( m_nFormatFlags & ColumnTransferFormatFlags::CONTROL_EXCHANGE )
                 _pContainer->CopyAny( SotClipboardFormatId::SBA_CTRLDATAEXCHANGE, makeAny( m_sCompatibleFormat ) );
 
-            if ( m_nFormatFlags & CTF_COLUMN_DESCRIPTOR )
+            if ( m_nFormatFlags & ColumnTransferFormatFlags::COLUMN_DESCRIPTOR )
             {
                 Any aContent = makeAny( m_aDescriptor.createPropertyValueSequence() );
                 _pContainer->CopyAny( getDescriptorFormatId(), aContent );
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 4e3e0ffc33e0..d7959e6fdd00 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -222,7 +222,7 @@ sal_Int8 FmGridHeader::AcceptDrop( const AcceptDropEvent& rEvt )
 
     // search for recognized formats
     const DataFlavorExVector& rFlavors = GetDataFlavorExVector();
-    if (OColumnTransferable::canExtractColumnDescriptor(rFlavors, CTF_COLUMN_DESCRIPTOR | CTF_FIELD_DESCRIPTOR))
+    if (OColumnTransferable::canExtractColumnDescriptor(rFlavors, ColumnTransferFormatFlags::COLUMN_DESCRIPTOR | ColumnTransferFormatFlags::FIELD_DESCRIPTOR))
         return rEvt.mnAction;
 
     return DND_ACTION_NONE;
@@ -236,8 +236,8 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
     TransferableDataHelper aDroppedData(_rEvt.maDropEvent.Transferable);
 
     // check the formats
-    bool bColumnDescriptor  = OColumnTransferable::canExtractColumnDescriptor(aDroppedData.GetDataFlavorExVector(), CTF_COLUMN_DESCRIPTOR);
-    bool bFieldDescriptor   = OColumnTransferable::canExtractColumnDescriptor(aDroppedData.GetDataFlavorExVector(), CTF_FIELD_DESCRIPTOR);
+    bool bColumnDescriptor  = OColumnTransferable::canExtractColumnDescriptor(aDroppedData.GetDataFlavorExVector(), ColumnTransferFormatFlags::COLUMN_DESCRIPTOR);
+    bool bFieldDescriptor   = OColumnTransferable::canExtractColumnDescriptor(aDroppedData.GetDataFlavorExVector(), ColumnTransferFormatFlags::FIELD_DESCRIPTOR);
     if (!bColumnDescriptor && !bFieldDescriptor)
     {
         OSL_FAIL("FmGridHeader::ExecuteDrop: should never have reached this (no extractable format)!");
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index acf428e32f9d..49e2e4ec3d73 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -162,7 +162,7 @@ void FmFieldWinListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPi
     aDescriptor[ daColumnName ] <<= pInfo->sColumnName;
 
     TransferableHelper* pTransferColumn = new OColumnTransferable(
-        aDescriptor, CTF_FIELD_DESCRIPTOR | CTF_CONTROL_EXCHANGE | CTF_COLUMN_DESCRIPTOR
+        aDescriptor, ColumnTransferFormatFlags::FIELD_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE | ColumnTransferFormatFlags::COLUMN_DESCRIPTOR
     );
     Reference< XTransferable> xEnsureDelete = pTransferColumn;
     EndSelection();
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index e2dea59c31d3..c5d4bd1e2e28 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -497,7 +497,7 @@ void SwDBTreeList::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ )
                             sdb::CommandType::TABLE,
                             sTableName,
                             sColumnName,
-                            (CTF_FIELD_DESCRIPTOR|CTF_COLUMN_DESCRIPTOR) );
+                            (ColumnTransferFormatFlags::FIELD_DESCRIPTOR|ColumnTransferFormatFlags::COLUMN_DESCRIPTOR) );
             aColTransfer.addDataToContainer( pContainer );
         }
 
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 7a27619f4f86..97c7c2e6fc35 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -2649,7 +2649,7 @@ bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
                                     ? 0
                                     : FN_QRY_INSERT_FIELD );
         DataFlavorExVector& rVector = rData.GetDataFlavorExVector();
-        bool bHaveColumnDescriptor = OColumnTransferable::canExtractColumnDescriptor(rVector, CTF_COLUMN_DESCRIPTOR | CTF_CONTROL_EXCHANGE);
+        bool bHaveColumnDescriptor = OColumnTransferable::canExtractColumnDescriptor(rVector, ColumnTransferFormatFlags::COLUMN_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE);
         if ( SotClipboardFormatId::XFORMS == nFmt )
         {
             rSh.MakeDrawView();
diff --git a/sw/source/uibase/utlui/condedit.cxx b/sw/source/uibase/utlui/condedit.cxx
index b15694b02b00..dbf9da568af8 100644
--- a/sw/source/uibase/utlui/condedit.cxx
+++ b/sw/source/uibase/utlui/condedit.cxx
@@ -46,7 +46,7 @@ sal_Int8 ConditionEdit::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
 {
     return OColumnTransferable::canExtractColumnDescriptor
         ( GetDataFlavorExVector(),
-                                CTF_COLUMN_DESCRIPTOR )
+                                ColumnTransferFormatFlags::COLUMN_DESCRIPTOR )
                 ? DND_ACTION_COPY
                 : DND_ACTION_NONE;
 }
@@ -59,7 +59,7 @@ sal_Int8 ConditionEdit::ExecuteDrop( const ExecuteDropEvent& rEvt )
         TransferableDataHelper aData( rEvt.maDropEvent.Transferable );
 
             DataFlavorExVector& rVector = aData.GetDataFlavorExVector();
-            if(OColumnTransferable::canExtractColumnDescriptor(rVector, CTF_COLUMN_DESCRIPTOR))
+            if(OColumnTransferable::canExtractColumnDescriptor(rVector, ColumnTransferFormatFlags::COLUMN_DESCRIPTOR))
             {
                 ODataAccessDescriptor aColDesc = OColumnTransferable::extractColumnDescriptor(
                                                                     aData);