diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-14 12:00:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-14 12:00:41 +0200 |
| commit | 68041a0546fc6a05608411365c8382937aafac79 (patch) | |
| tree | c0676833d41c491956c71b946f7c69ca0a34f734 /sw | |
| parent | 741d9990bf9d9dfcba1166a12ffb1d846c912181 (diff) | |
convert INPUTCONTEXT_ constants to scoped enum
Change-Id: I5b99e42a3e85527b27d515c468d2ed66386fc9df
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/shells/basesh.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/view.cxx | 16 | ||||
| -rw-r--r-- | sw/source/uibase/web/wview.cxx | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 38e935e05d70..fe41345faf5e 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -4966,8 +4966,8 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView): if( !rMyView.GetDocShell()->IsReadOnly() ) { vcl::Font aFont; - SetInputContext( InputContext( aFont, INPUTCONTEXT_TEXT | - INPUTCONTEXT_EXTTEXTINPUT ) ); + SetInputContext( InputContext( aFont, InputContextFlags::Text | + InputContextFlags::ExtText ) ); } } diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 1a199517b7d0..3be5b835e260 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -2126,8 +2126,8 @@ void SwBaseShell::GetTxtFontCtrlState( SfxItemSet& rSet ) bool bVertical = rSh.IsInVerticalText(); aFont.SetOrientation(bVertical ? 2700 : 0); aFont.SetVertical(bVertical); - GetView().GetEditWin().SetInputContext( InputContext( aFont, INPUTCONTEXT_TEXT | - INPUTCONTEXT_EXTTEXTINPUT ) ); + GetView().GetEditWin().SetInputContext( InputContext( aFont, InputContextFlags::Text | + InputContextFlags::ExtText ) ); } } break; diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 02c00d766132..eb369258ce26 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -422,11 +422,11 @@ void SwView::SelectShell() InputContext aCntxt( GetEditWin().GetInputContext() ); aCntxt.SetOptions( bSetExtInpCntxt ? (aCntxt.GetOptions() | - ( INPUTCONTEXT_TEXT | - INPUTCONTEXT_EXTTEXTINPUT )) + ( InputContextFlags::Text | + InputContextFlags::ExtText )) : (aCntxt.GetOptions() & ~ - ( INPUTCONTEXT_TEXT | - INPUTCONTEXT_EXTTEXTINPUT )) ); + InputContextFlags( InputContextFlags::Text | + InputContextFlags::ExtText )) ); GetEditWin().SetInputContext( aCntxt ); } @@ -665,11 +665,11 @@ void SwView::_CheckReadonlySelection() InputContext aCntxt( GetEditWin().GetInputContext() ); aCntxt.SetOptions( SW_DISABLE_ON_PROTECTED_CURSOR & nDisableFlags ? (aCntxt.GetOptions() & ~ - ( INPUTCONTEXT_TEXT | - INPUTCONTEXT_EXTTEXTINPUT )) + InputContextFlags( InputContextFlags::Text | + InputContextFlags::ExtText )) : (aCntxt.GetOptions() | - ( INPUTCONTEXT_TEXT | - INPUTCONTEXT_EXTTEXTINPUT )) ); + ( InputContextFlags::Text | + InputContextFlags::ExtText )) ); GetEditWin().SetInputContext( aCntxt ); } break; diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx index ecd15c64109a..1a4e702ec1a8 100644 --- a/sw/source/uibase/web/wview.cxx +++ b/sw/source/uibase/web/wview.cxx @@ -260,11 +260,11 @@ void SwWebView::SelectShell() InputContext aCntxt( GetEditWin().GetInputContext() ); aCntxt.SetOptions( bSetExtInpCntxt ? (aCntxt.GetOptions() | - ( INPUTCONTEXT_TEXT | - INPUTCONTEXT_EXTTEXTINPUT )) + ( InputContextFlags::Text | + InputContextFlags::ExtText )) : (aCntxt.GetOptions() & ~ - ( INPUTCONTEXT_TEXT | - INPUTCONTEXT_EXTTEXTINPUT )) ); + InputContextFlags( InputContextFlags::Text | + InputContextFlags::ExtText )) ); GetEditWin().SetInputContext( aCntxt ); } |