diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-06-01 20:58:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-06-04 08:29:44 +0000 |
| commit | 407c6c871ea53d9fb97c50e1ee24db7a8e5d70e1 (patch) | |
| tree | def66e4a10d904cb5d2a7df58f764c94da77e69c /sw/source/uibase/uiview | |
| parent | bf98e6acde066ce3d204c3cdcfbd06ec70f7f17d (diff) | |
replace FLYPROTECT with scoped enum
Change-Id: I665d2944f5d24b4ec5015274c1b95b106a028291
Reviewed-on: https://gerrit.libreoffice.org/16072
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/source/uibase/uiview')
| -rw-r--r-- | sw/source/uibase/uiview/view.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/viewdraw.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/viewstat.cxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/viewtab.cxx | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index c767a6af5ad5..52f9cc7ad84c 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -151,7 +151,7 @@ void SwView::ImpSetVerb( int nSelType ) if ( !GetViewFrame()->GetFrame().IsInPlace() && (nsSelectionType::SEL_OLE|nsSelectionType::SEL_GRF) & nSelType ) { - if ( !m_pWrtShell->IsSelObjProtected(FLYPROTECT_CONTENT) ) + if ( m_pWrtShell->IsSelObjProtected(FlyProtectFlags::Content) == FlyProtectFlags::NONE ) { if ( nSelType & nsSelectionType::SEL_OLE ) { diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index 36d5907f69a6..7540776fb21c 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -492,7 +492,7 @@ bool SwView::EnterDrawTextMode(const Point& aDocPos) ( pObj->ISA(SwDrawVirtObj) && static_cast<SwDrawVirtObj*>(pObj)->GetReferencedObj().ISA(SdrTextObj) ) ) && - !m_pWrtShell->IsSelObjProtected(FLYPROTECT_CONTENT)) + m_pWrtShell->IsSelObjProtected(FlyProtectFlags::Content) == FlyProtectFlags::NONE ) { // Refuse to edit editeng text of the shape if it has textbox attached. if (!lcl_isTextBox(pObj)) diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx index 2d9b0354d094..1315f6867c94 100644 --- a/sw/source/uibase/uiview/viewstat.cxx +++ b/sw/source/uibase/uiview/viewstat.cxx @@ -80,7 +80,7 @@ void SwView::GetState(SfxItemSet &rSet) if( m_pWrtShell->GetLinkManager().GetLinks().empty() ) rSet.DisableItem(nWhich); else if( m_pWrtShell->IsSelFrmMode() && - m_pWrtShell->IsSelObjProtected(FLYPROTECT_CONTENT)) + m_pWrtShell->IsSelObjProtected(FlyProtectFlags::Content) != FlyProtectFlags::NONE) { rSet.DisableItem(nWhich); } @@ -108,8 +108,8 @@ void SwView::GetState(SfxItemSet &rSet) rSet.DisableItem(nWhich); } else if((m_pWrtShell->IsObjSelected() || m_pWrtShell->IsFrmSelected()) && - (m_pWrtShell->IsSelObjProtected( FLYPROTECT_PARENT)|| - m_pWrtShell->IsSelObjProtected( FLYPROTECT_CONTENT ))) + (m_pWrtShell->IsSelObjProtected( FlyProtectFlags::Parent) != FlyProtectFlags::NONE || + m_pWrtShell->IsSelObjProtected( FlyProtectFlags::Content ) != FlyProtectFlags::NONE)) { rSet.DisableItem(nWhich); } diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx index 7dac67eb7e16..5245344ddb3f 100644 --- a/sw/source/uibase/uiview/viewtab.cxx +++ b/sw/source/uibase/uiview/viewtab.cxx @@ -2011,12 +2011,12 @@ void SwView::StateTabWin(SfxItemSet& rSet) { if(bFrmSelection) { - sal_uInt8 nProtect = m_pWrtShell->IsSelObjProtected( FLYPROTECT_SIZE|FLYPROTECT_POS|FLYPROTECT_CONTENT ); + FlyProtectFlags nProtect = m_pWrtShell->IsSelObjProtected( FlyProtectFlags::Size|FlyProtectFlags::Pos|FlyProtectFlags::Content ); SvxProtectItem aProt(SID_RULER_PROTECT); - aProt.SetContentProtect((nProtect & FLYPROTECT_CONTENT) != 0); - aProt.SetSizeProtect ((nProtect & FLYPROTECT_SIZE) != 0); - aProt.SetPosProtect ((nProtect & FLYPROTECT_POS) != 0); + aProt.SetContentProtect(bool(nProtect & FlyProtectFlags::Content)); + aProt.SetSizeProtect (bool(nProtect & FlyProtectFlags::Size)); + aProt.SetPosProtect (bool(nProtect & FlyProtectFlags::Pos)); rSet.Put(aProt); } else |