diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-20 15:29:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-22 17:52:20 +0000 |
| commit | 866d1bbecb7cfe8256d38e5fb77c7bce149e648f (patch) | |
| tree | cd48f4d5419335ab4f80ffe80051570e1386dcd1 /vcl/unx | |
| parent | 3aeeaae41e8fa5a025b9b792da75c6766f17f8f2 (diff) | |
Convert PreeditStatus to scoped enum
Change-Id: Ibc1329d9c6c2c5fe84fa2c0b0d420da82a82adc1
Reviewed-on: https://gerrit.libreoffice.org/25202
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/app/i18n_cb.cxx | 18 | ||||
| -rw-r--r-- | vcl/unx/generic/app/i18n_ic.cxx | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index a892c90b5065..2c7bc6725441 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -42,9 +42,9 @@ int PreeditStartCallback ( XIC, XPointer client_data, XPointer ) { preedit_data_t* pPreeditData = reinterpret_cast<preedit_data_t*>(client_data); - if ( pPreeditData->eState == ePreeditStatusActivationRequired ) + if ( pPreeditData->eState == PreeditStatus::ActivationRequired ) { - pPreeditData->eState = ePreeditStatusActive; + pPreeditData->eState = PreeditStatus::Active; pPreeditData->aText.nCursorPos = 0; pPreeditData->aText.nLength = 0; } @@ -57,13 +57,13 @@ PreeditStartCallback ( XIC, XPointer client_data, XPointer ) void PreeditDoneCallback ( XIC, XPointer client_data, XPointer ) { - preedit_data_t* pPreeditData = reinterpret_cast<preedit_data_t*>(client_data); - if (pPreeditData->eState == ePreeditStatusActive ) + preedit_data_t* pPreeditData = reinterpret_cast<preedit_data_t*>(client_data); + if (pPreeditData->eState == PreeditStatus::Active ) { if( pPreeditData->pFrame ) pPreeditData->pFrame->CallCallback( SalEvent::EndExtTextInput, nullptr ); } - pPreeditData->eState = ePreeditStatusStartPending; + pPreeditData->eState = PreeditStatus::StartPending; } // iii. preedit draw callback @@ -314,8 +314,8 @@ PreeditDrawCallback(XIC ic, XPointer client_data, // if (pPreeditData->eState == ePreeditStatusStartPending && call_data->text == NULL) // return; - if ( pPreeditData->eState == ePreeditStatusStartPending ) - pPreeditData->eState = ePreeditStatusActivationRequired; + if ( pPreeditData->eState == PreeditStatus::StartPending ) + pPreeditData->eState = PreeditStatus::ActivationRequired; PreeditStartCallback( ic, client_data, nullptr ); // Edit the internal textbuffer as indicated by the call_data, @@ -368,13 +368,13 @@ PreeditDrawCallback(XIC ic, XPointer client_data, pPreeditData->aInputEv.mnCursorFlags = 0; // default: make cursor visible pPreeditData->aInputEv.mbOnlyCursor = False; - if ( pPreeditData->eState == ePreeditStatusActive && pPreeditData->pFrame ) + if ( pPreeditData->eState == PreeditStatus::Active && pPreeditData->pFrame ) pPreeditData->pFrame->CallCallback(SalEvent::ExtTextInput, static_cast<void*>(&pPreeditData->aInputEv)); if (pPreeditData->aText.nLength == 0 && pPreeditData->pFrame ) pPreeditData->pFrame->CallCallback( SalEvent::EndExtTextInput, nullptr ); if (pPreeditData->aText.nLength == 0) - pPreeditData->eState = ePreeditStatusStartPending; + pPreeditData->eState = PreeditStatus::StartPending; GetPreeditSpotLocation(ic, reinterpret_cast<XPointer>(pPreeditData)); } diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index d4102fb894fe..a67e58998e7c 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -179,7 +179,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : // for status callbacks and commit string callbacks #define PREEDIT_BUFSZ 16 - maClientData.eState = ePreeditStatusStartPending; + maClientData.eState = PreeditStatus::StartPending; maClientData.pFrame = pFrame; maClientData.aText.pUnicodeBuffer = static_cast<sal_Unicode*>(malloc(PREEDIT_BUFSZ * sizeof(sal_Unicode))); |