From c97b81ea139a2299d9528f4ef04d0f88acc60c09 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Wed, 22 Apr 2015 14:06:13 +0200
Subject: convert CTF_ constants to scoped enum

Change-Id: I1c8149e9fccde761bb2a5fd2cf3cddcd2d9748dd
---
 sw/source/uibase/dbui/dbtree.cxx     | 2 +-
 sw/source/uibase/dochdl/swdtflvr.cxx | 2 +-
 sw/source/uibase/utlui/condedit.cxx  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'sw')

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);
-- 
cgit