diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-12 10:28:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-12 11:34:22 +0200 |
| commit | bad8bb24142348e7273fedfa5f8f4132a131254e (patch) | |
| tree | 00a1c6800ce9d9de823ae6546f18cd88ae8c1ceb /sw/source/uibase/uiview/viewdlg2.cxx | |
| parent | 3cee2b2d5823e83fbfa01b2987df2452f75fc777 (diff) | |
convert SelectionType to scoped enum
Change-Id: Iefdf6d47b1c0189c3b3e39ad5a025e95f18fe6b6
Reviewed-on: https://gerrit.libreoffice.org/36446
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase/uiview/viewdlg2.cxx')
| -rw-r--r-- | sw/source/uibase/uiview/viewdlg2.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx index 203a0666a4f9..a01e2d864ace 100644 --- a/sw/source/uibase/uiview/viewdlg2.cxx +++ b/sw/source/uibase/uiview/viewdlg2.cxx @@ -115,13 +115,13 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt) } SelectionType eType = rSh.GetSelectionType(); - if (eType & nsSelectionType::SEL_OLE) - eType = nsSelectionType::SEL_GRF; + if (eType & SelectionType::Ole) + eType = SelectionType::Graphic; - const SwLabelType eT = (eType & nsSelectionType::SEL_TBL) ? LTYPE_TABLE : - (eType & nsSelectionType::SEL_FRM) ? LTYPE_FLY : - (eType == nsSelectionType::SEL_TXT) ? LTYPE_FLY : - (eType & nsSelectionType::SEL_DRW) ? LTYPE_DRAW : + const SwLabelType eT = (eType & SelectionType::Table) ? LTYPE_TABLE : + (eType & SelectionType::Frame) ? LTYPE_FLY : + (eType == SelectionType::Text) ? LTYPE_FLY : + (eType & SelectionType::DrawObject) ? LTYPE_DRAW : LTYPE_OBJECT; SwFieldMgr aMgr(&rSh); @@ -186,15 +186,15 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt) } // remember category - if (eType & nsSelectionType::SEL_GRF) + if (eType & SelectionType::Graphic) SetOldGrfCat(rName); - else if( eType & nsSelectionType::SEL_TBL) + else if( eType & SelectionType::Table) SetOldTabCat(rName); - else if( eType & nsSelectionType::SEL_FRM) + else if( eType & SelectionType::Frame) SetOldFrameCat(rName); - else if( eType == nsSelectionType::SEL_TXT) + else if( eType == SelectionType::Text) SetOldFrameCat(rName); - else if( eType & nsSelectionType::SEL_DRW) + else if( eType & SelectionType::DrawObject) SetOldDrwCat(rName); } |