diff options
| -rw-r--r-- | sw/inc/SidebarWindowsTypes.hxx | 8 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/PostItMgr.cxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/SidebarWin.cxx | 14 |
3 files changed, 14 insertions, 14 deletions
diff --git a/sw/inc/SidebarWindowsTypes.hxx b/sw/inc/SidebarWindowsTypes.hxx index 4933c21d892e..28d1e5891ff1 100644 --- a/sw/inc/SidebarWindowsTypes.hxx +++ b/sw/inc/SidebarWindowsTypes.hxx @@ -22,11 +22,11 @@ namespace sw { namespace sidebarwindows { -enum ViewState +enum class ViewState { - VS_NORMAL, - VS_VIEW, - VS_EDIT + NORMAL, + VIEW, + EDIT }; enum SidebarPosition diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 84af66bef99f..3857c85ff72e 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -1584,13 +1584,13 @@ void SwPostItMgr::SetShadowState(const SwPostItField* pFld,bool bCursor) sw::annotation::SwAnnotationWin* pOldPostIt = GetAnnotationWin(mShadowState.mpShadowFld); if (pOldPostIt && pOldPostIt->Shadow() && (pOldPostIt->Shadow()->GetShadowState() != SS_EDIT)) - pOldPostIt->SetViewState(VS_NORMAL); + pOldPostIt->SetViewState(ViewState::NORMAL); } //set new one, if it is not currently edited sw::annotation::SwAnnotationWin* pNewPostIt = GetAnnotationWin(pFld); if (pNewPostIt && pNewPostIt->Shadow() && (pNewPostIt->Shadow()->GetShadowState() != SS_EDIT)) { - pNewPostIt->SetViewState(VS_VIEW); + pNewPostIt->SetViewState(ViewState::VIEW); //remember our new field mShadowState.mpShadowFld = pFld; mShadowState.bCursor = false; @@ -1616,7 +1616,7 @@ void SwPostItMgr::SetShadowState(const SwPostItField* pFld,bool bCursor) sw::annotation::SwAnnotationWin* pOldPostIt = GetAnnotationWin(mShadowState.mpShadowFld); if (pOldPostIt && pOldPostIt->Shadow() && (pOldPostIt->Shadow()->GetShadowState() != SS_EDIT)) { - pOldPostIt->SetViewState(VS_NORMAL); + pOldPostIt->SetViewState(ViewState::NORMAL); mShadowState.mpShadowFld = 0; } } diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 9b016644633e..6fd6c992e4cd 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -995,7 +995,7 @@ void SwSidebarWin::ActivatePostIt() mpOutliner->GetUndoManager().Clear(); CheckMetaText(); - SetViewState(VS_EDIT); + SetViewState(ViewState::EDIT); GetOutlinerView()->ShowCursor(); mpOutlinerView->GetEditView().SetInsertMode(mrView.GetWrtShellPtr()->IsInsMode()); @@ -1017,7 +1017,7 @@ void SwSidebarWin::DeactivatePostIt() mpOutliner->CompleteOnlineSpelling(); - SetViewState(VS_NORMAL); + SetViewState(ViewState::NORMAL); // write the visible text back into the SwField UpdateData(); @@ -1125,7 +1125,7 @@ IMPL_LINK( SwSidebarWin, WindowEventListener, VclSimpleEvent*, pEvent ) mbMouseOver = true; if ( !HasFocus() ) { - SetViewState(VS_VIEW); + SetViewState(ViewState::VIEW); Invalidate(); } } @@ -1136,7 +1136,7 @@ IMPL_LINK( SwSidebarWin, WindowEventListener, VclSimpleEvent*, pEvent ) mbMouseOver = false; if ( !HasFocus() ) { - SetViewState(VS_NORMAL); + SetViewState(ViewState::NORMAL); Invalidate(); } } @@ -1250,7 +1250,7 @@ void SwSidebarWin::SetViewState(ViewState bViewState) { switch (bViewState) { - case VS_EDIT: + case ViewState::EDIT: { if (mpAnchor) { @@ -1271,7 +1271,7 @@ void SwSidebarWin::SetViewState(ViewState bViewState) mpShadow->SetShadowState(SS_EDIT); break; } - case VS_VIEW: + case ViewState::VIEW: { if (mpAnchor) { @@ -1285,7 +1285,7 @@ void SwSidebarWin::SetViewState(ViewState bViewState) mpShadow->SetShadowState(SS_VIEW); break; } - case VS_NORMAL: + case ViewState::NORMAL: { if (mpAnchor) { |