vcl/unx/generic/app/i18n_cb.cxx | 32 +-------------------------------
1 file changed, 1 insertion(+), 31 deletions(-)
New commits:
commit d073cca5f7c04de3e1bcedda334d864e98ac7835
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Sun May 24 18:35:41 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon May 25 20:13:35 2020 +0200
Clean up dead code
...after 5bfa8b8d5e1cf3cb572dbd91bf3b0cfcf29fb65a "tdf#118314 Code clean up
on
imestatuswindow" had removed the sole consumer of aText.
(It is unclear to me whether the use of StatusDrawCallback in the
SalI18N_InputContext in vcl/unx/generic/app/i18n_ic.cxx is still necessary
when
StatusDrawCallback does not do anything. But StatusStartCallback and
StatusDoneCallback do not do anything, either, and are used exactly the
same way
there, so lets keep all that, at least for now.)
Change-Id: Ic2a61819c6bb8ed192231ca309f03b6c29768f29
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94760
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index 52bf3bf873fe..4e5f9952c20f 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -469,38 +469,8 @@ StatusDoneCallback (XIC, XPointer, XPointer)
}
void
-StatusDrawCallback (XIC, XPointer, XIMStatusDrawCallbackStruct *call_data)
+StatusDrawCallback (XIC, XPointer, XIMStatusDrawCallbackStruct *)
{
- if( call_data->type == XIMTextType )
- {
- OUString aText;
- if( call_data->data.text )
- {
- // XIM with text
- char* pMBString = nullptr;
- size_t nLength = 0;
- if( call_data->data.text->encoding_is_wchar )
- {
- if( call_data->data.text->string.wide_char )
- {
- wchar_t* pWString = call_data->data.text->string.wide_char;
- size_t nBytes = wcstombs( nullptr, pWString, 1024 );
- pMBString = static_cast<char*>(alloca( nBytes+1 ));
- nLength = wcstombs( pMBString, pWString, nBytes+1 );
- }
- }
- else
- {
- if( call_data->data.text->string.multi_byte )
- {
- pMBString = call_data->data.text->string.multi_byte;
- nLength = strlen( pMBString );
- }
- }
- if( nLength )
- aText = OUString( pMBString, nLength,
osl_getThreadTextEncoding() );
- }
- }
}
// vii. destroy callbacks: internally disable all IC/IM calls
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
