diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-04-02 16:45:44 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-04-02 16:54:18 +0300 |
commit | 50bf123ddbeb457b89636621a99c971834adf3ab (patch) | |
tree | b7782261998ca0b6bece98543e2c66e3c96f4d3c /vcl/unx/generic/app/i18n_ic.cxx | |
parent | db1c9e4dadc90c5afe3190776a60cc5dcbbce3ac (diff) |
Kill superfluous vertical whitespace
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
Diffstat (limited to 'vcl/unx/generic/app/i18n_ic.cxx')
-rw-r--r-- | vcl/unx/generic/app/i18n_ic.cxx | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index 4430caaef58b..8c429d50ac39 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <sal/alloca.h> @@ -56,13 +55,9 @@ static void sendEmptyCommit( SalFrame* pFrame ) pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL ); } - - // Constructor / Destructor, the InputContext is bound to the SalFrame, as it // needs the shell window as a focus window - - SalI18N_InputContext::~SalI18N_InputContext() { if ( maContext != NULL ) @@ -80,10 +75,8 @@ SalI18N_InputContext::~SalI18N_InputContext() free(maClientData.aText.pCharStyle); } - // convenience routine to add items to a XVaNestedList - static XVaNestedList XVaAddToNestedList( XVaNestedList a_srclist, char* name, XPointer value ) { @@ -111,10 +104,8 @@ XVaAddToNestedList( XVaNestedList a_srclist, char* name, XPointer value ) return a_dstlist != NULL ? a_dstlist : a_srclist ; } - // convenience routine to create a fontset - static XFontSet get_font_set( Display *p_display ) { @@ -133,12 +124,8 @@ get_font_set( Display *p_display ) return p_font_set; } - - // Constructor for a InputContext (IC) - - SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : mbUseable( True ), maContext( (XIC)NULL ), @@ -196,10 +183,8 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : maClientData.aText.nCursorPos = 0; maClientData.aText.nLength = 0; - // Status attributes - switch ( mnStatusStyle ) { case XIMStatusCallbacks: @@ -236,10 +221,8 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : break; } - // set preedit attributes - switch ( mnPreeditStyle ) { case XIMPreeditCallbacks: @@ -373,13 +356,9 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : } } - - // In Solaris 8 the status window does not unmap if the frame unmapps, so // unmap it the hard way - - void SalI18N_InputContext::Unmap( SalFrame* pFrame ) { @@ -419,13 +398,9 @@ SalI18N_InputContext::Map( SalFrame *pFrame ) } } - - // Handle DestroyCallbacks // in fact this is a callback called from the XNDestroyCallback - - void SalI18N_InputContext::HandleDestroyIM() { @@ -433,13 +408,9 @@ SalI18N_InputContext::HandleDestroyIM() mbUseable = False; } - - // make sure, the input method gets all the X-Events it needs, this is only // called once on each frame, it relys on a valid maContext - - void SalI18N_InputContext::ExtendEventMask( XLIB_Window aFocusWindow ) { @@ -460,12 +431,8 @@ SalI18N_InputContext::ExtendEventMask( XLIB_Window aFocusWindow ) } } - - // tune the styles provided by the input method with the supported one - - unsigned int SalI18N_InputContext::GetWeightingOfIMStyle( XIMStyle nStyle ) const { @@ -547,12 +514,8 @@ SalI18N_InputContext::SupportInputMethodStyle( XIMStyles *pIMStyles ) return (mnPreeditStyle != 0) && (mnStatusStyle != 0) ; } - - // handle extended and normal key input - - int SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength) { @@ -603,14 +566,10 @@ SalI18N_InputContext::UpdateSpotLocation() return 0; } - - // set and unset the focus for the Input Context // the context may be NULL despite it is useable if the framewindow is // in unmapped state - - void SalI18N_InputContext::SetICFocus( SalFrame* pFocusFrame ) { @@ -655,12 +614,8 @@ SalI18N_InputContext::UnsetICFocus( SalFrame* pFrame ) } } - - // multi byte input method only - - void SalI18N_InputContext::SetLanguage(LanguageType) { @@ -689,5 +644,4 @@ SalI18N_InputContext::EndExtTextInput( sal_uInt16 /*nFlags*/ ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |