callcatcher: clean up vcl i18n

4 files changed, 0 insertions, 85 deletions

diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx
index 7b16a7d2bfd8..e00dc5fe0a43 100644
--- a/vcl/inc/unx/i18n_cb.hxx
+++ b/vcl/inc/unx/i18n_cb.hxx
@@ -35,9 +35,6 @@
 extern "C" {
 #endif
 
-// for iiimp / ml input
-int  CommitStringCallback( XIC ic, XPointer client_data, XPointer call_data);
-
 // xim callbacks
 void PreeditDoneCallback ( XIC ic, XPointer client_data, XPointer call_data);
 int  PreeditStartCallback( XIC ic, XPointer client_data, XPointer call_data);
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index 3a9c5aba64fb..5e427f920ed4 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -82,7 +82,6 @@ public:
     void Map( SalFrame *pFrame );
     void Unmap( SalFrame* pFrame );
 
-    void SetPreeditState(Bool aPreeditState);
     void SetLanguage(LanguageType aInputLanguage);
 
     SalI18N_InputContext( SalFrame *aFrame );
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index b37d0ab16e91..40818d08e3a4 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -498,45 +498,6 @@ IsControlCode(sal_Unicode nChar)
         return False;
 }
 
-int
-CommitStringCallback( XIC ic, XPointer client_data, XPointer call_data )
-{
-    preedit_data_t* pPreeditData = (preedit_data_t*)client_data;
-
-      XIMUnicodeText *cbtext = (XIMUnicodeText *)call_data;
-      sal_Unicode *p_unicode_data = (sal_Unicode*)cbtext->string.utf16_char;
-
-    // filter unexpected pure control events
-    if (cbtext->length == 1 && IsControlCode(p_unicode_data[0]) )
-    {
-        if( pPreeditData->pFrame )
-        {
-            pPreeditData->pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, (void*)NULL );
-        }
-    }
-    else
-    {
-        if( pPreeditData->pFrame )
-        {
-            pPreeditData->aInputEv.mnTime           = 0;
-            pPreeditData->aInputEv.mpTextAttr       = 0;
-            pPreeditData->aInputEv.mnCursorPos      = cbtext->length;
-            pPreeditData->aInputEv.maText           = UniString(p_unicode_data, cbtext->length);
-            pPreeditData->aInputEv.mnCursorFlags    = 0; // default: make cursor visible
-            pPreeditData->aInputEv.mnDeltaStart     = 0;
-            pPreeditData->aInputEv.mbOnlyCursor     = False;
-
-            pPreeditData->pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&pPreeditData->aInputEv);
-            pPreeditData->pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, (void*)NULL );
-        }
-    }
-    pPreeditData->eState = ePreeditStatusStartPending;
-
-    GetPreeditSpotLocation(ic, (XPointer)pPreeditData);
-
-    return 0;
-}
-
 // ----------------------------------------------------------------------------------
 //
 // vi. status callbacks: for now these are empty, they are just needed for turbo linux
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index 7b48cab75d12..fad955c0a238 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -565,21 +565,6 @@ SalI18N_InputContext::SupportInputMethodStyle( XIMStyles *pIMStyles )
 // ---------------------------------------------------------------------------
 
 int
-SalI18N_InputContext::CommitStringCallback (sal_Unicode* pText, sal_Size nLength)
-{
-    XIMUnicodeText call_data;
-
-    call_data.string.utf16_char = pText;
-    call_data.length            = nLength;
-    call_data.annotations       = NULL;
-    call_data.count_annotations = 0;
-    call_data.feedback          = NULL;
-
-    return ::CommitStringCallback( maContext,
-                                   (XPointer)&maClientData, (XPointer)&call_data );
-}
-
-int
 SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength)
 {
     if (nLength == 1 && IsControlCode(pText[0]))
@@ -689,33 +674,6 @@ SalI18N_InputContext::UnsetICFocus( SalFrame* pFrame )
 // ---------------------------------------------------------------------------
 
 void
-SalI18N_InputContext::SetPreeditState(Bool aPreeditState)
-{
-    XIMPreeditState preedit_state = XIMPreeditUnKnown;
-    XVaNestedList preedit_attr;
-
-    preedit_attr = XVaCreateNestedList(
-                                       0,
-                                       XNPreeditState, &preedit_state,
-                                       NULL);
-    if (!XGetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL))
-    {
-        XFree(preedit_attr);
-
-        preedit_state = aPreeditState? XIMPreeditEnable : XIMPreeditDisable;
-        preedit_attr = XVaCreateNestedList(
-                                           0,
-                                           XNPreeditState, preedit_state,
-                                           NULL);
-        XSetICValues(maContext, XNPreeditAttributes, preedit_attr, NULL);
-    }
-
-    XFree(preedit_attr);
-
-    return;
-}
-
-void
 SalI18N_InputContext::SetLanguage(LanguageType)
 {
     // not yet implemented