[Libreoffice-commits] core.git: vcl/inc vcl/unx

Stephan Bergmann sbergman at redhat.com
Fri Jun 27 09:08:51 PDT 2014


 vcl/inc/unx/XIM.h               |    2 --
 vcl/inc/unx/i18n_cb.hxx         |    1 -
 vcl/unx/generic/app/i18n_im.cxx |    3 ---
 3 files changed, 6 deletions(-)

New commits:
commit 4c6e54a194516acda6499136a5e9996126dbcb10
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 27 18:07:52 2014 +0200

    loplugin:unreffun: redundant function redeclaration
    
    Change-Id: I6c9b85ab587f6fb9f585c9714c3a1076f627c7d3

diff --git a/vcl/inc/unx/XIM.h b/vcl/inc/unx/XIM.h
index 4239921..62c127e 100644
--- a/vcl/inc/unx/XIM.h
+++ b/vcl/inc/unx/XIM.h
@@ -22,8 +22,6 @@
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
 
-extern Status XCloseIM(XIM);
-
 #ifndef XIMCallback1
 typedef int (*XIMProc1)(XIC, XPointer, XPointer);
 typedef struct {
diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx
index 4d13799..7ce4f46 100644
--- a/vcl/inc/unx/i18n_cb.hxx
+++ b/vcl/inc/unx/i18n_cb.hxx
@@ -29,7 +29,6 @@ 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 PreeditDoneCallback ( 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_im.cxx b/vcl/unx/generic/app/i18n_im.cxx
index 7522416..4137e4b 100644
--- a/vcl/unx/generic/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -43,9 +43,6 @@
 
 using namespace vcl;
 #include "unx/i18n_cb.hxx"
-#if defined(SOLARIS) ||  defined(LINUX)
-extern "C" char * XSetIMValues(XIM im, ...);
-#endif
 
 // kinput2 IME needs special key handling since key release events are filtered in
 // preeditmode and XmbResetIC does not work


More information about the Libreoffice-commits mailing list