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/window/salframe.cxx | |
parent | db1c9e4dadc90c5afe3190776a60cc5dcbbce3ac (diff) |
Kill superfluous vertical whitespace
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
Diffstat (limited to 'vcl/unx/generic/window/salframe.cxx')
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index a292449b66db..3a60c1ff6a35 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <signal.h> #include <string.h> #include <stdio.h> @@ -893,7 +892,6 @@ X11SalFrame::~X11SalFrame() delete pFreeGraphics_; } - XDestroyWindow( GetXDisplay(), mhWindow ); /* @@ -1807,7 +1805,6 @@ bool X11SalFrame::GetWindowState( SalFrameState* pState ) pState->mnMask = _FRAMESTATE_MASK_GEOMETRY | WINDOWSTATE_MASK_STATE; - if (! maRestorePosSize.IsEmpty() ) { GetPosSize( aPosSize ); @@ -2287,7 +2284,6 @@ void X11SalFrame::StartPresentation( bool bStart ) doReparentPresentationDialogues( GetDisplay() ); hPresentationWindow = (bStart && IsOverrideRedirect() ) ? GetWindow() : None; - // needs static here to save DPMS settings int dummy; static bool DPMSExtensionAvailable = @@ -2304,7 +2300,6 @@ void X11SalFrame::StartPresentation( bool bStart ) static CARD16 dpms_suspend_timeout=0; static CARD16 dpms_off_timeout=0; - if( bStart || nScreenSaversTimeout_ || DPMSEnabled) { if( hPresentationWindow ) @@ -2322,7 +2317,6 @@ void X11SalFrame::StartPresentation( bool bStart ) &prefer_blanking, &allow_exposures ); - // get the DPMS state right before the start if (DPMSExtensionAvailable) { @@ -2460,15 +2454,11 @@ void X11SalFrame::SetTitle( const OUString& rTitle ) } } - - void X11SalFrame::Flush() { XFlush( GetDisplay()->GetDisplay() ); } - - void X11SalFrame::Sync() { XSync( GetDisplay()->GetDisplay(), False ); @@ -2513,16 +2503,12 @@ void X11SalFrame::SetInputContext( SalInputContext* pContext ) return; } - - void X11SalFrame::EndExtTextInput( sal_uInt16 nFlags ) { if (mpInputContext != NULL) mpInputContext->EndExtTextInput( nFlags ); } - - OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode ) { return GetDisplay()->GetKeyName( nKeyCode ); @@ -2779,7 +2765,6 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent ) } } - if( LeaveNotify == pEvent->type || EnterNotify == pEvent->type ) { /* @@ -3386,7 +3371,6 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent ) } } - // update the spot location for PreeditPosition IME style if (! aDeleteWatch.isDeleted()) @@ -3430,7 +3414,6 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent ) } } - if ( pEvent->mode == NotifyNormal || pEvent->mode == NotifyWhileGrabbed || ( ( nStyle_ & SAL_FRAME_STYLE_PLUG ) && pEvent->window == GetShellWindow() ) ) @@ -3444,8 +3427,6 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent ) mbInputFocus = True; ImplSVData* pSVData = ImplGetSVData(); - - long nRet = CallCallback( SALEVENT_GETFOCUS, 0 ); if ((mpParent != NULL && nStyle_ == 0) && pSVData->maWinData.mpFirstFloat ) @@ -3613,7 +3594,6 @@ long X11SalFrame::HandleSizeEvent( XConfigureEvent *pEvent ) return 1; } - if( ( nStyle_ & SAL_FRAME_STYLE_PLUG ) && pEvent->window == GetShellWindow() ) { // just update the children's positions @@ -4133,7 +4113,6 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) CurrentTime ); } - RestackChildren(); mbInShow = false; m_bSetFocusOnMap = false; |