summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-21 15:33:43 +0200
committerNoel Grandin <noel@peralex.com>2015-04-22 10:28:41 +0200
commit1b5f6935a498c1d9eea35ba0aa2edd25ee11ca47 (patch)
tree40347c60c1970acf90dd6db95f4067bb4216a62e /sw
parent38143e4599e4ec759a11ea96a4b852bb00a42ab6 (diff)
convert SV_DRAGDOP_ constants to scoped enum
Change-Id: If953610ed24a2b6d5f33f2ba014fba2ca5308d7d
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx2
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx2
-rw-r--r--sw/source/ui/misc/glossary.cxx8
-rw-r--r--sw/source/uibase/dbui/dbtree.cxx2
-rw-r--r--sw/source/uibase/utlui/content.cxx4
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx8
-rw-r--r--sw/source/uibase/utlui/navipi.cxx6
7 files changed, 16 insertions, 16 deletions
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 58d0fc443810..44d7ff52b384 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -1194,7 +1194,7 @@ DDListBox::DDListBox(vcl::Window* pParent, WinBits nStyle)
SetStyle( GetStyle() | /*WB_HASBUTTONS|WB_HASBUTTONSATROOT|*/
WB_CLIPCHILDREN );
SetSelectionMode( SINGLE_SELECTION );
- SetDragDropMode( SV_DRAGDROP_CTRL_COPY );
+ SetDragDropMode( DragDropMode::CTRL_COPY );
EnableAsyncDrag(true);
// expand selection to the complete width of the ListBox
SetHighlightRange();
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index e701558e985a..f780d35f3446 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -57,7 +57,7 @@ SwAddressTable::SwAddressTable(SvSimpleTableContainer& rParent, WinBits nBits)
{
SetSpaceBetweenEntries(3);
SetSelectionMode(SINGLE_SELECTION);
- SetDragDropMode(0);
+ SetDragDropMode(DragDropMode::NONE);
EnableAsyncDrag(false);
}
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 0c2960398514..858fd69bdd3a 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -812,7 +812,7 @@ SwGlTreeListBox::SwGlTreeListBox(vcl::Window* pParent, WinBits nBits)
, sReadonly(SW_RESSTR(SW_STR_READONLY)),
pDragEntry(0)
{
- SetDragDropMode( SV_DRAGDROP_CTRL_MOVE|SV_DRAGDROP_CTRL_COPY );
+ SetDragDropMode( DragDropMode::CTRL_MOVE|DragDropMode::CTRL_COPY );
}
Size SwGlTreeListBox::GetOptimalSize() const
@@ -892,7 +892,7 @@ DragDropMode SwGlTreeListBox::NotifyStartDrag(
DragDropMode eRet;
pDragEntry = pEntry;
if(!GetParent(pEntry))
- eRet = SV_DRAGDROP_NONE;
+ eRet = DragDropMode::NONE;
else
{
SwGlossaryDlg* pDlg = static_cast<SwGlossaryDlg*>(GetParentDialog());
@@ -903,10 +903,10 @@ DragDropMode SwGlTreeListBox::NotifyStartDrag(
+ OUStringLiteral1<GLOS_DELIM>()
+ OUString::number(pGroupData->nPathIdx);
sal_Int8 nDragOption = DND_ACTION_COPY;
- eRet = SV_DRAGDROP_CTRL_COPY;
+ eRet = DragDropMode::CTRL_COPY;
if(!pDlg->pGlossaryHdl->IsReadOnly(&sEntry))
{
- eRet |= SV_DRAGDROP_CTRL_MOVE;
+ eRet |= DragDropMode::CTRL_MOVE;
nDragOption |= DND_ACTION_MOVE;
}
SetDragOptions( nDragOption );
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 2ad207ce04f3..64bcf9c87ae8 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -210,7 +210,7 @@ void SwDBTreeList::InitTreeList()
SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE),
aImageList.GetImage(IMG_EXPAND ) );
- SetDragDropMode(SV_DRAGDROP_APP_COPY);
+ SetDragDropMode(DragDropMode::APP_COPY);
GetModel()->SetCompareHdl(LINK(this, SwDBTreeList, DBCompare));
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index b41cbf5e998c..282a72749611 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -816,7 +816,7 @@ SwContentTree::SwContentTree(vcl::Window* pParent, const ResId& rResId)
SetNodeDefaultImages();
SetDoubleClickHdl(LINK(this, SwContentTree, ContentDoubleClickHdl));
- SetDragDropMode(SV_DRAGDROP_APP_COPY);
+ SetDragDropMode(DragDropMode::APP_COPY);
for (sal_uInt16 i = 0; i < CONTENT_TYPE_MAX; i++)
{
aActiveContentArr[i] = 0;
@@ -2492,7 +2492,7 @@ DragDropMode SwContentTree::NotifyStartDrag(
&& !GetWrtShell()->GetView().GetDocShell()->IsReadOnly())
eMode = GetDragDropMode();
else if(!bIsActive && GetWrtShell()->GetView().GetDocShell()->HasName())
- eMode = SV_DRAGDROP_APP_COPY;
+ eMode = DragDropMode::APP_COPY;
sal_Int8 nDragMode;
FillTransferData( rContainer, nDragMode );
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index e794c98b3687..2f4b0a5009f6 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -161,9 +161,9 @@ SwGlobalTree::SwGlobalTree(vcl::Window* pParent, const ResId& rResId) :
bIsImageListInitialized ( false )
{
- SetDragDropMode(SV_DRAGDROP_APP_COPY |
- SV_DRAGDROP_CTRL_MOVE |
- SV_DRAGDROP_ENABLE_TOP );
+ SetDragDropMode(DragDropMode::APP_COPY |
+ DragDropMode::CTRL_MOVE |
+ DragDropMode::ENABLE_TOP );
aUpdateTimer.SetTimeout(GLOBAL_UPDATE_TIMEOUT);
aUpdateTimer.SetTimeoutHdl(LINK(this, SwGlobalTree, Timeout));
@@ -525,7 +525,7 @@ DragDropMode SwGlobalTree::NotifyStartDrag( TransferDataContainer& ,
{
bIsInternalDrag = true;
pDDSource = pEntry;
- return SV_DRAGDROP_CTRL_MOVE;
+ return DragDropMode::CTRL_MOVE;
}
sal_IntPtr SwGlobalTree::GetTabPos( SvTreeListEntry*, SvLBoxTab* pTab)
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 2d7c6c7903da..946d409c1e58 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -763,9 +763,9 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
aContentTree.SetSpaceBetweenEntries(3);
aContentTree.SetSelectionMode( SINGLE_SELECTION );
- aContentTree.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE |
- SV_DRAGDROP_CTRL_COPY |
- SV_DRAGDROP_ENABLE_TOP );
+ aContentTree.SetDragDropMode( DragDropMode::CTRL_MOVE |
+ DragDropMode::CTRL_COPY |
+ DragDropMode::ENABLE_TOP );
aContentTree.EnableAsyncDrag(true);
aContentTree.ShowTree();
aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX, true);