diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-29 17:12:52 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-30 06:41:28 +0000 |
commit | c47b170c71ecdcaacf2e12e5ce28e7d411bb52e6 (patch) | |
tree | d9cfdc4f6be613f7b2523a64978686f85cc5ed68 /sw | |
parent | 8ac4240efe975e9689e8dfc23dc3c1b88eee6dcf (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 'sw')
-rw-r--r-- | sw/source/ui/chrdlg/swuiccoll.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/addresslistdialog.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmoutputtypepage.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/selectdbtabledialog.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dialog/uiregionsw.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/envelp/label1.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/fldui/changedb.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddinf.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/bookmark.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/dbui/dbtree.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/misc/redlndlg.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/utlui/navipi.cxx | 4 |
14 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 271e8ee2436b..a3d24473ad8b 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -91,7 +91,7 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet) m_pFilterLB->SetSelectHdl( LINK(this, SwCondCollPage, SelectListBoxHdl)); m_pTbLinks->SetStyle(m_pTbLinks->GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN); - m_pTbLinks->SetSelectionMode( SINGLE_SELECTION ); + m_pTbLinks->SetSelectionMode( SelectionMode::Single ); m_pTbLinks->SetTabs( &nTabs[0] ); m_pTbLinks->Resize(); // OS: Hack for the right selection m_pTbLinks->SetSpaceBetweenEntries( 0 ); diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index bef855f4010e..ccb8673accd6 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -204,7 +204,7 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) m_pListLB->setColSizes(); m_pListLB->SetStyle( m_pListLB->GetStyle() | WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ); - m_pListLB->SetSelectionMode( SINGLE_SELECTION ); + m_pListLB->SetSelectionMode( SelectionMode::Single ); m_pOK->SetClickHdl( LINK( this, SwAddressListDialog, OKHdl_Impl)); uno::Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext() ); diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index f40210598488..dcec0a444d56 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -1248,7 +1248,7 @@ DDListBox::DDListBox(vcl::Window* pParent, WinBits nStyle) { SetStyle( GetStyle() | /*WB_HASBUTTONS|WB_HASBUTTONSATROOT|*/ WB_CLIPCHILDREN ); - SetSelectionMode( SINGLE_SELECTION ); + SetSelectionMode( SelectionMode::Single ); SetDragDropMode( DragDropMode::CTRL_COPY ); EnableAsyncDrag(true); // expand selection to the complete width of the ListBox diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 5b7a4a77190b..b4414563b6eb 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -293,7 +293,7 @@ SwSendMailDialog::SwSendMailDialog(vcl::Window *pParent, SwMailMergeConfigItem& static long nTabs[] = {2, 0, nPos1}; m_pStatus->SetStyle( m_pStatus->GetStyle() | WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ); - m_pStatus->SetSelectionMode( SINGLE_SELECTION ); + m_pStatus->SetSelectionMode( SelectionMode::Single ); m_pStatus->SetTabs(&nTabs[0], MAP_PIXEL); m_pStatus->SetSpaceBetweenEntries(3); diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 4d28d76a711e..e9472ce6f1d2 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -55,7 +55,7 @@ SwAddressTable::SwAddressTable(SvSimpleTableContainer& rParent) : SvSimpleTable(rParent, 0) { SetSpaceBetweenEntries(3); - SetSelectionMode(SINGLE_SELECTION); + SetSelectionMode(SelectionMode::Single); SetDragDropMode(DragDropMode::NONE); EnableAsyncDrag(false); } diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 3db1ed3cde6d..3c3e65ff06f8 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -362,7 +362,7 @@ SwEditRegionDlg::SwEditRegionDlg( vcl::Window* pParent, SwWrtShell& rWrtSh ) m_pSubRegionED->AddEventListener(LINK(this, SwEditRegionDlg, SubRegionEventHdl)); m_pSubRegionED->EnableAutocomplete(true, true); - m_pTree->SetSelectionMode( MULTIPLE_SELECTION ); + m_pTree->SetSelectionMode( SelectionMode::Multiple ); m_pTree->SetStyle(m_pTree->GetStyle()|WB_HASBUTTONSATROOT|WB_CLIPCHILDREN|WB_HSCROLL); m_pTree->SetSpaceBetweenEntries(0); m_pTree->SetAllEntriesAccessibleRoleType(SvTreeAccRoleType::TREE); diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 60eaf5c04fdf..66bf387b26f3 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -593,7 +593,7 @@ SwVisitingCardPage::SwVisitingCardPage(vcl::Window* pParent, const SfxItemSet& r m_pAutoTextLB->SetStyle( m_pAutoTextLB->GetStyle() | WB_HSCROLL ); m_pAutoTextLB->SetSpaceBetweenEntries(0); - m_pAutoTextLB->SetSelectionMode( SINGLE_SELECTION ); + m_pAutoTextLB->SetSelectionMode( SelectionMode::Single ); SetExchangeSupport(); m_pAutoTextLB->SetSelectHdl(LINK(this, SwVisitingCardPage, AutoTextSelectTreeListBoxHdl)); diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index ba47d61eada5..ab3fd3565a5b 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -69,7 +69,7 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) m_pDefineBT->SetClickHdl(LINK(this, SwChangeDBDlg, ButtonHdl)); m_pAddDBPB->SetClickHdl(LINK(this, SwChangeDBDlg, AddDBHdl)); - m_pUsedDBTLB->SetSelectionMode(MULTIPLE_SELECTION); + m_pUsedDBTLB->SetSelectionMode(SelectionMode::Multiple); m_pUsedDBTLB->SetStyle(m_pUsedDBTLB->GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); m_pUsedDBTLB->SetSpaceBetweenEntries(0); m_pUsedDBTLB->SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE), aImageList.GetImage(IMG_EXPAND)); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index a270ce6135de..b09d6d7a8426 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -71,7 +71,7 @@ SwFieldDokInfPage::SwFieldDokInfPage(vcl::Window* pParent, const SfxItemSet *con m_pFormatLB->set_width_request(nWidth); m_pSelectionLB->set_width_request(nWidth); - m_pTypeTLB->SetSelectionMode(SINGLE_SELECTION); + m_pTypeTLB->SetSelectionMode(SelectionMode::Single); m_pTypeTLB->SetStyle(m_pTypeTLB->GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); m_pTypeTLB->SetOptimalImageIndent(); // Don't set font, so that the control's font is adopted! diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 94a222f2bed5..95e6a97b53d0 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1879,7 +1879,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAt sLevelStr = m_pLevelFT->GetText(); m_pLevelLB->SetStyle( m_pLevelLB->GetStyle() | WB_HSCROLL ); m_pLevelLB->SetSpaceBetweenEntries(0); - m_pLevelLB->SetSelectionMode( SINGLE_SELECTION ); + m_pLevelLB->SetSelectionMode( SelectionMode::Single ); m_pLevelLB->SetHighlightRange(); // select full width m_pLevelLB->Show(); diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 03b7f6269ea4..a50e74fc415a 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -340,7 +340,7 @@ BookmarkTable::BookmarkTable(SvSimpleTableContainer& rParent) : static long nTabs[] = {3, 0, 40, 150}; SetTabs(nTabs, MAP_PIXEL); - SetSelectionMode(MULTIPLE_SELECTION); + SetSelectionMode(SelectionMode::Multiple); InsertHeaderEntry(OUString(SW_RES(STR_PAGE))); InsertHeaderEntry(OUString(SW_RES(STR_BOOKMARK_NAME))); InsertHeaderEntry(OUString(SW_RES(STR_BOOKMARK_TEXT))); diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index 5e00af7fff22..3086204a7a37 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -183,7 +183,7 @@ void SwDBTreeList::InitTreeList() { if(!pImpl->HasContext() && pImpl->GetWrtShell()) return; - SetSelectionMode(SINGLE_SELECTION); + SetSelectionMode(SelectionMode::Single); SetStyle(GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); // don't set font, so that the Control's font is being applied! SetSpaceBetweenEntries(0); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 6928993639ef..48e342364fc0 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -206,7 +206,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer m_pTable->SetStyle(m_pTable->GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); m_pTable->SetNodeDefaultImages(); - m_pTable->SetSelectionMode(MULTIPLE_SELECTION); + m_pTable->SetSelectionMode(SelectionMode::Multiple); m_pTable->SetHighlightRange(1); m_pTable->SortByCol(nSortMode, bSortDir); diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 5c70544e3121..a90970c13787 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -773,7 +773,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, m_aContentTree->SetStyle( m_aContentTree->GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT| WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); m_aContentTree->SetSpaceBetweenEntries(3); - m_aContentTree->SetSelectionMode( SINGLE_SELECTION ); + m_aContentTree->SetSelectionMode( SelectionMode::Single ); m_aContentTree->SetDragDropMode( DragDropMode::CTRL_MOVE | DragDropMode::CTRL_COPY | DragDropMode::ENABLE_TOP ); @@ -783,7 +783,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, // TreeListBox for global document m_aGlobalTree->setPosSizePixel( 0, nListboxYPos, 0, 0, PosSizeFlags::Y ); - m_aGlobalTree->SetSelectionMode( MULTIPLE_SELECTION ); + m_aGlobalTree->SetSelectionMode( SelectionMode::Multiple ); m_aGlobalTree->SetStyle( m_aGlobalTree->GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT| WB_CLIPCHILDREN|WB_HSCROLL ); Size aGlblSize(m_aGlobalToolBox->CalcWindowSizePixel()); |