vcl/inc/unx/i18n_cb.hxx | 2 +-
vcl/unx/generic/app/i18n_cb.cxx | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 24aed4f9a5f6351d9153c96e3d1d1aa68028c0d0
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Mon Mar 25 18:54:05 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Mon Mar 25 23:34:33 2024 +0100
Avoid -Werror,-Wcast-function-type-mismatch, remove unused int return
> vcl/unx/generic/app/i18n_ic.cxx:225:51: error: cast from 'int (*)(XIC,
XPointer, XPointer)' (aka 'int (*)(_XIC *, char *, char *)') to 'XIMProc' (aka
'void (*)(_XIM *, char *, char *)') converts to incompatible function type
[-Werror,-Wcast-function-type-mismatch]
> 225 | maPreeditStartCallback.callback =
reinterpret_cast<XIMProc>(PreeditStartCallback);
> |
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Change-Id: I94d1d0042516a01f8597bc65895042ddae76c98b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165291
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx
index 4b498f387820..497875236c5d 100644
--- a/vcl/inc/unx/i18n_cb.hxx
+++ b/vcl/inc/unx/i18n_cb.hxx
@@ -28,7 +28,7 @@ extern "C" {
// xim callbacks
void PreeditDoneCallback ( XIC ic, XPointer client_data, XPointer call_data);
-int PreeditStartCallback( XIC ic, XPointer client_data, XPointer call_data);
+void PreeditStartCallback( XIC ic, XPointer client_data, XPointer call_data);
void PreeditDrawCallback ( XIC ic, XPointer client_data,
XIMPreeditDrawCallbackStruct *call_data );
void PreeditCaretCallback( XIC ic, XPointer client_data,
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index c17c01a4d225..d4efcf34fd55 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -34,7 +34,7 @@
// i. preedit start callback
-int
+void
PreeditStartCallback ( XIC, XPointer client_data, XPointer )
{
preedit_data_t* pPreeditData =
reinterpret_cast<preedit_data_t*>(client_data);
@@ -43,8 +43,6 @@ PreeditStartCallback ( XIC, XPointer client_data, XPointer )
pPreeditData->eState = PreeditStatus::Active;
pPreeditData->aText.nLength = 0;
}
-
- return -1;
}
// ii. preedit done callback
