From 3709fe0e2e9336787f3d18b8ae4a1ff2ef5608e6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 11 Jan 2014 21:01:19 +0000 Subject: mnDeltaStart is unused Change-Id: I4f970a150b8ecf6e5631c89ae78ae97134c78d7c --- vcl/inc/salwtype.hxx | 1 - vcl/osx/salframeview.mm | 3 --- vcl/unx/generic/app/i18n_cb.cxx | 1 - vcl/unx/generic/app/i18n_ic.cxx | 3 --- vcl/unx/generic/window/salframe.cxx | 3 --- vcl/unx/gtk/window/gtksalframe.cxx | 3 --- vcl/win/source/window/salframe.cxx | 2 -- 7 files changed, 16 deletions(-) (limited to 'vcl') diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index de9e2a4c38ab..770c025bab21 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -177,7 +177,6 @@ struct SalExtTextInputEvent OUString maText; // Text const sal_uInt16* mpTextAttr; // Text-Attribute sal_uLong mnCursorPos; // Cursor-Position - sal_uLong mnDeltaStart; // Start-Position of last change sal_uInt8 mnCursorFlags; // EXTTEXTINPUT_CURSOR_xxx sal_Bool mbOnlyCursor; // sal_True: Only Cursor-Position has been changed }; diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index 81ae1cdce8c3..cc4b76868078 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -1084,7 +1084,6 @@ private: aEvent.maText = aInsertString; aEvent.mpTextAttr = NULL; aEvent.mnCursorPos = aInsertString.getLength(); - aEvent.mnDeltaStart = 0; aEvent.mnCursorFlags = 0; aEvent.mbOnlyCursor = FALSE; mpFrame->CallCallback( SALEVENT_EXTTEXTINPUT, &aEvent ); @@ -1099,7 +1098,6 @@ private: aEvent.maText = OUString(); aEvent.mpTextAttr = NULL; aEvent.mnCursorPos = 0; - aEvent.mnDeltaStart = 0; aEvent.mnCursorFlags = 0; aEvent.mbOnlyCursor = FALSE; mpFrame->CallCallback( SALEVENT_EXTTEXTINPUT, &aEvent ); @@ -1612,7 +1610,6 @@ private: int len = [aString length]; SalExtTextInputEvent aInputEvent; aInputEvent.mnTime = mpFrame->mnLastEventTime; - aInputEvent.mnDeltaStart = 0; aInputEvent.mbOnlyCursor = FALSE; if( len > 0 ) { NSString *pString = [aString string]; diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index 6c34568605d8..b5c2f7775050 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -386,7 +386,6 @@ PreeditDrawCallback(XIC ic, XPointer client_data, pPreeditData->aInputEv.maText = OUString(pPreeditData->aText.pUnicodeBuffer, pPreeditData->aText.nLength); pPreeditData->aInputEv.mnCursorFlags = 0; // default: make cursor visible - pPreeditData->aInputEv.mnDeltaStart = 0; // call_data->chg_first; pPreeditData->aInputEv.mbOnlyCursor = False; if ( pPreeditData->eState == ePreeditStatusActive && pPreeditData->pFrame ) diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index 3348a4f026cb..345f4f75f82b 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -50,7 +50,6 @@ static void sendEmptyCommit( SalFrame* pFrame ) aEmptyEv.maText = ""; aEmptyEv.mnCursorPos = 0; aEmptyEv.mnCursorFlags = 0; - aEmptyEv.mnDeltaStart = 0; aEmptyEv.mbOnlyCursor = False; pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aEmptyEv ); if( ! aDel.isDeleted() ) @@ -170,7 +169,6 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : maClientData.aInputEv.mnTime = 0; maClientData.aInputEv.mpTextAttr = NULL; maClientData.aInputEv.mnCursorPos = 0; - maClientData.aInputEv.mnDeltaStart = 0; maClientData.aInputEv.mnCursorFlags = 0; maClientData.aInputEv.mbOnlyCursor = sal_False; @@ -570,7 +568,6 @@ SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength) aTextEvent.mnCursorPos = nLength; aTextEvent.maText = OUString(pText, nLength); aTextEvent.mnCursorFlags = 0; - aTextEvent.mnDeltaStart = 0; aTextEvent.mbOnlyCursor = False; maClientData.pFrame->CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aTextEvent); diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index ee04b72a6c27..ee1abf8722aa 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -2974,7 +2974,6 @@ void X11SalFrame::beginUnicodeSequence() aEv.maText = rSeq; aEv.mpTextAttr = &nTextAttr; aEv.mnCursorPos = 0; - aEv.mnDeltaStart = 0; aEv.mnCursorFlags = 0; aEv.mbOnlyCursor = sal_False; @@ -3004,7 +3003,6 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c ) aEv.maText = rSeq; aEv.mpTextAttr = &attribs[0]; aEv.mnCursorPos = 0; - aEv.mnDeltaStart = 0; aEv.mnCursorFlags = 0; aEv.mbOnlyCursor = sal_False; @@ -3037,7 +3035,6 @@ bool X11SalFrame::endUnicodeSequence() aEv.maText = OUString( sal_Unicode(nValue) ); aEv.mpTextAttr = &nTextAttr; aEv.mnCursorPos = 0; - aEv.mnDeltaStart = 0; aEv.mnCursorFlags = 0; aEv.mbOnlyCursor = sal_False; CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv); diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index de96dbdc3bb2..6e6fef0a9977 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -4037,7 +4037,6 @@ void GtkSalFrame::IMHandler::sendEmptyCommit() aEmptyEv.maText = ""; aEmptyEv.mnCursorPos = 0; aEmptyEv.mnCursorFlags = 0; - aEmptyEv.mnDeltaStart = 0; aEmptyEv.mbOnlyCursor = False; m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aEmptyEv ); if( ! aDel.isDeleted() ) @@ -4230,7 +4229,6 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* CONTEXT_ARG, gchar* p pThis->m_aInputEvent.maText = OUString( pText, strlen(pText), RTL_TEXTENCODING_UTF8 ); pThis->m_aInputEvent.mnCursorPos = pThis->m_aInputEvent.maText.getLength(); pThis->m_aInputEvent.mnCursorFlags = 0; - pThis->m_aInputEvent.mnDeltaStart = 0; pThis->m_aInputEvent.mbOnlyCursor = False; pThis->m_aInputFlags.clear(); @@ -4317,7 +4315,6 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_ pThis->m_aInputEvent.maText = OUString( pText, strlen(pText), RTL_TEXTENCODING_UTF8 ); pThis->m_aInputEvent.mnCursorPos = nCursorPos; pThis->m_aInputEvent.mnCursorFlags = 0; - pThis->m_aInputEvent.mnDeltaStart = 0; pThis->m_aInputEvent.mbOnlyCursor = False; pThis->m_aInputFlags = std::vector( std::max( 1, (int)pThis->m_aInputEvent.maText.getLength() ), 0 ); diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index db91127e7df2..817d277d96bf 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -5194,7 +5194,6 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, aEvt.mnTime = GetMessageTime(); aEvt.mpTextAttr = NULL; aEvt.mnCursorPos = 0; - aEvt.mnDeltaStart = 0; aEvt.mbOnlyCursor = FALSE; aEvt.mnCursorFlags = 0; @@ -5339,7 +5338,6 @@ static sal_Bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam ) aEvt.mnTime = GetMessageTime(); aEvt.mpTextAttr = NULL; aEvt.mnCursorPos = 0; - aEvt.mnDeltaStart = 0; aEvt.mbOnlyCursor = FALSE; aEvt.mnCursorFlags = 0; pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aEvt ); -- cgit