summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2016-05-29 17:12:52 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-05-30 06:41:28 +0000
commitc47b170c71ecdcaacf2e12e5ce28e7d411bb52e6 (patch)
treed9cfdc4f6be613f7b2523a64978686f85cc5ed68 /sd
parent8ac4240efe975e9689e8dfc23dc3c1b88eee6dcf (diff)
Convert SelectionMode to scoped enum
Change-Id: I86c435de3918540cb54a0cb24568e58456c2f9d1 Reviewed-on: https://gerrit.libreoffice.org/25611 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx2
-rw-r--r--sd/source/ui/dlg/inspagob.cxx2
-rw-r--r--sd/source/ui/dlg/navigatr.cxx10
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx4
4 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index ddb14db39d0d..e6a63faf53a8 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -463,7 +463,7 @@ CustomAnimationList::CustomAnimationList( vcl::Window* pParent )
{
EnableContextMenuHandling();
- SetSelectionMode( MULTIPLE_SELECTION );
+ SetSelectionMode( SelectionMode::Multiple );
SetOptimalImageIndent();
SetNodeDefaultImages();
}
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index b0f8bad8e629..5e9ca9680b20 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -74,7 +74,7 @@ void SdInsertPagesObjsDlg::Reset()
{
if( pMedium )
{
- m_pLbTree->SetSelectionMode( MULTIPLE_SELECTION );
+ m_pLbTree->SetSelectionMode( SelectionMode::Multiple );
// transfer ownership of Medium
m_pLbTree->Fill( mpDoc, pMedium, rName );
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index b761777e6702..e6b5e52f677c 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -103,7 +103,7 @@ SdNavigatorWin::SdNavigatorWin(
long nListboxYPos = maToolbox->GetPosPixel().Y() + maToolbox->GetSizePixel().Height() + 4;
maTlbObjects->setPosSizePixel( 0, nListboxYPos, 0, 0, PosSizeFlags::Y );
maTlbObjects->SetDoubleClickHdl( LINK( this, SdNavigatorWin, ClickObjectHdl ) );
- maTlbObjects->SetSelectionMode( SINGLE_SELECTION );
+ maTlbObjects->SetSelectionMode( SelectionMode::Single );
// set focus to listbox, otherwise it is in the toolbox which is only useful
// for keyboard navigation
maTlbObjects->GrabFocus();
@@ -465,10 +465,10 @@ IMPL_LINK_TYPED( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu, bool )
if( maTlbObjects->GetSelectionCount() > 1 )
maTlbObjects->SelectAll( false );
- maTlbObjects->SetSelectionMode( SINGLE_SELECTION );
+ maTlbObjects->SetSelectionMode( SelectionMode::Single );
}
else
- maTlbObjects->SetSelectionMode( MULTIPLE_SELECTION );
+ maTlbObjects->SetSelectionMode( SelectionMode::Multiple );
}
}
return false;
@@ -601,7 +601,7 @@ bool SdNavigatorWin::InsertFile(const OUString& rFileName)
if (xMedium->IsStorage())
{
// Now depending on mode:
- // maTlbObjects->SetSelectionMode(MULTIPLE_SELECTION);
+ // maTlbObjects->SetSelectionMode(SelectionMode::Multiple);
// handover of ownership of xMedium;
SdDrawDocument* pDropDoc = maTlbObjects->GetBookmarkDoc(xMedium.release());
@@ -917,7 +917,7 @@ void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId,
if( !pNavigatorWin->maTlbObjects->HasSelectedChildren( aPageName ) )
{
- if( pNavigatorWin->maTlbObjects->GetSelectionMode() == MULTIPLE_SELECTION )
+ if( pNavigatorWin->maTlbObjects->GetSelectionMode() == SelectionMode::Multiple )
{
// because otherwise it is always additional select
pNavigatorWin->maTlbObjects->SelectAll( false );
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 0e0babdc0ab2..ba371adeb783 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1143,7 +1143,7 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel)
// targets. This prevents moving shapes from one page to another.
// Select all entries and disable them as drop targets.
- SetSelectionMode(MULTIPLE_SELECTION);
+ SetSelectionMode(SelectionMode::Multiple);
SetCursor(static_cast<SvTreeListEntry*>(nullptr));
SelectAll(true, false);
EnableSelectionAsDropTarget(false);
@@ -1162,7 +1162,7 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel)
// Set selection back to the entry under the mouse.
SelectAll(false, false);
- SetSelectionMode(SINGLE_SELECTION);
+ SetSelectionMode(SelectionMode::Single);
Select(pEntry);
// We can delete the Navigator from ExecuteDrag (when switching to