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/source/window/winproc.cxx | |
parent | db1c9e4dadc90c5afe3190776a60cc5dcbbce3ac (diff) |
Kill superfluous vertical whitespace
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
Diffstat (limited to 'vcl/source/window/winproc.cxx')
-rw-r--r-- | vcl/source/window/winproc.cxx | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 17f745d291c0..8a061b5821e4 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -52,12 +52,8 @@ #include <com/sun/star/datatransfer/dnd/XDragSource.hpp> #include <com/sun/star/awt/MouseEvent.hpp> - - #define IMPL_MIN_NEEDSYSWIN 49 - - bool ImplCallPreNotify( NotifyEvent& rEvt ) { return Application::CallEventHooks( rEvt ) @@ -168,8 +164,6 @@ static bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos, return false; } - - static void ImplHandleMouseHelpRequest( Window* pChild, const Point& rMousePos ) { ImplSVData* pSVData = ImplGetSVData(); @@ -200,8 +194,6 @@ static void ImplHandleMouseHelpRequest( Window* pChild, const Point& rMousePos ) } } - - static void ImplSetMousePointer( Window* pChild ) { ImplSVData* pSVData = ImplGetSVData(); @@ -211,8 +203,6 @@ static void ImplSetMousePointer( Window* pChild ) pChild->ImplGetFrame()->SetPointer( pChild->ImplGetMousePointer() ); } - - static bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = NULL, bool bMouse = false, Point* pPos = NULL ) { @@ -254,8 +244,6 @@ static bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = NULL return false; } - - /* #i34277# delayed context menu activation; * necessary if there already was a popup menu running. */ @@ -767,7 +755,6 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav if ( aDelData.IsDead() ) return true; - if ( nSVEvent == EVENT_MOUSEMOVE ) pChild->ImplGetWindowImpl()->mpFrameData->mbInMouseMove = false; @@ -850,8 +837,6 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav return bRet; } - - static Window* ImplGetKeyInputWindow( Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); @@ -893,8 +878,6 @@ static Window* ImplGetKeyInputWindow( Window* pWindow ) return pChild; } - - static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, sal_uInt16 nKeyCode, sal_uInt16 nCharCode, sal_uInt16 nRepeat, bool bForward ) { @@ -1183,8 +1166,6 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, return nRet; } - - static bool ImplHandleExtTextInput( Window* pWindow, const OUString& rText, const sal_uInt16* pTextAttr, @@ -1278,8 +1259,6 @@ static bool ImplHandleExtTextInput( Window* pWindow, return !ImplCallCommand( pChild, COMMAND_EXTTEXTINPUT, &aData ); } - - static bool ImplHandleEndExtTextInput( Window* /* pWindow */ ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1307,8 +1286,6 @@ static bool ImplHandleEndExtTextInput( Window* /* pWindow */ ) return nRet; } - - static void ImplHandleExtTextInputPos( Window* pWindow, Rectangle& rRect, long& rInputWidth, bool * pVertical ) @@ -1355,8 +1332,6 @@ static void ImplHandleExtTextInputPos( Window* pWindow, = pChild != 0 && pChild->GetInputContext().GetFont().IsVertical(); } - - static bool ImplHandleInputContextChange( Window* pWindow, LanguageType eNewLang ) { Window* pChild = ImplGetKeyInputWindow( pWindow ); @@ -1364,8 +1339,6 @@ static bool ImplHandleInputContextChange( Window* pWindow, LanguageType eNewLang return !ImplCallCommand( pChild, COMMAND_INPUTCONTEXTCHANGE, &aData ); } - - static bool ImplCallWheelCommand( Window* pWindow, const Point& rPos, const CommandWheelData* pWheelData ) { @@ -1388,8 +1361,6 @@ static bool ImplCallWheelCommand( Window* pWindow, const Point& rPos, return false; } - - static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEvt, bool scaleDirectly = false ) { ImplDelData aDogTag( pWindow ); @@ -1495,7 +1466,6 @@ static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv return !bRet; } - #define IMPL_PAINT_CHECKRTL ((sal_uInt16)0x0020) static void ImplHandlePaint( Window* pWindow, const Rectangle& rBoundRect, bool bImmediateUpdate ) @@ -1528,8 +1498,6 @@ static void ImplHandlePaint( Window* pWindow, const Rectangle& rBoundRect, bool } } - - static void KillOwnPopups( Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1542,8 +1510,6 @@ static void KillOwnPopups( Window* pWindow ) } } - - void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ) { if( pWindow->GetStyle() & (WB_MOVEABLE|WB_SIZEABLE) ) @@ -1611,8 +1577,6 @@ void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ) pWindow->ImplGetWindowImpl()->mpFrameData->mbMinimized = bMinimized; } - - static void ImplHandleMove( Window* pWindow ) { if( pWindow->ImplGetWindowImpl()->mbFrame && pWindow->ImplIsFloatingWindow() && pWindow->IsReallyVisible() ) @@ -1638,16 +1602,12 @@ static void ImplHandleMove( Window* pWindow ) } - - static void ImplHandleMoveResize( Window* pWindow, long nNewWidth, long nNewHeight ) { ImplHandleMove( pWindow ); ImplHandleResize( pWindow, nNewWidth, nNewHeight ); } - - static void ImplActivateFloatingWindows( Window* pWindow, bool bActive ) { // First check all overlapping windows @@ -1666,9 +1626,6 @@ static void ImplActivateFloatingWindows( Window* pWindow, bool bActive ) } } - - - IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) { ImplGetWindowImpl()->mpFrameData->mnFocusId = 0; @@ -1777,13 +1734,10 @@ IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) return 0; } - - static void ImplHandleGetFocus( Window* pWindow ) { pWindow->ImplGetWindowImpl()->mpFrameData->mbHasFocus = true; - // execute Focus-Events after a delay, such that SystemChildWindows // do not blink when they receive focus if ( !pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId ) @@ -1796,8 +1750,6 @@ static void ImplHandleGetFocus( Window* pWindow ) } } - - static void ImplHandleLoseFocus( Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1836,7 +1788,6 @@ static void ImplHandleLoseFocus( Window* pWindow ) pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide( true ); } - struct DelayedCloseEvent { Window* pWindow; @@ -1916,8 +1867,6 @@ void ImplHandleClose( Window* pWindow ) } } - - static void ImplHandleUserEvent( ImplSVEvent* pSVEvent ) { if ( pSVEvent ) @@ -1946,8 +1895,6 @@ static void ImplHandleUserEvent( ImplSVEvent* pSVEvent ) } } - - static sal_uInt16 ImplGetMouseMoveMode( SalMouseEvent* pEvent ) { sal_uInt16 nMode = 0; @@ -1960,8 +1907,6 @@ static sal_uInt16 ImplGetMouseMoveMode( SalMouseEvent* pEvent ) return nMode; } - - static sal_uInt16 ImplGetMouseButtonMode( SalMouseEvent* pEvent ) { sal_uInt16 nMode = 0; @@ -1978,8 +1923,6 @@ static sal_uInt16 ImplGetMouseButtonMode( SalMouseEvent* pEvent ) return nMode; } - - inline bool ImplHandleSalMouseLeave( Window* pWindow, SalMouseEvent* pEvent ) { return ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, true, @@ -1988,8 +1931,6 @@ inline bool ImplHandleSalMouseLeave( Window* pWindow, SalMouseEvent* pEvent ) ImplGetMouseMoveMode( pEvent ) ); } - - inline bool ImplHandleSalMouseMove( Window* pWindow, SalMouseEvent* pEvent ) { return ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, false, @@ -1998,8 +1939,6 @@ inline bool ImplHandleSalMouseMove( Window* pWindow, SalMouseEvent* pEvent ) ImplGetMouseMoveMode( pEvent ) ); } - - inline bool ImplHandleSalMouseButtonDown( Window* pWindow, SalMouseEvent* pEvent ) { return ImplHandleMouseEvent( pWindow, EVENT_MOUSEBUTTONDOWN, false, @@ -2013,8 +1952,6 @@ inline bool ImplHandleSalMouseButtonDown( Window* pWindow, SalMouseEvent* pEvent ImplGetMouseButtonMode( pEvent ) ); } - - inline bool ImplHandleSalMouseButtonUp( Window* pWindow, SalMouseEvent* pEvent ) { return ImplHandleMouseEvent( pWindow, EVENT_MOUSEBUTTONUP, false, @@ -2028,15 +1965,11 @@ inline bool ImplHandleSalMouseButtonUp( Window* pWindow, SalMouseEvent* pEvent ) ImplGetMouseButtonMode( pEvent ) ); } - - static bool ImplHandleSalMouseActivate( Window* /*pWindow*/, SalMouseActivateEvent* /*pEvent*/ ) { return false; } - - static bool ImplHandleMenuEvent( Window* pWindow, SalMenuEvent* pEvent, sal_uInt16 nEvent ) { // Find SystemWindow and its Menubar and let it dispatch the command @@ -2078,8 +2011,6 @@ static bool ImplHandleMenuEvent( Window* pWindow, SalMenuEvent* pEvent, sal_uInt return nRet; } - - static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent ) { ImplSVData* pSVData = ImplGetSVData(); @@ -2117,8 +2048,6 @@ static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent ) } } - - static void ImplHandleInputLanguageChange( Window* pWindow ) { // find window @@ -2129,8 +2058,6 @@ static void ImplHandleInputLanguageChange( Window* pWindow ) ImplCallCommand( pChild, COMMAND_INPUTLANGUAGECHANGE ); } - - static void ImplHandleSalSettings( sal_uInt16 nEvent ) { Application* pApp = GetpApp(); @@ -2183,8 +2110,6 @@ static void ImplHandleSalSettings( sal_uInt16 nEvent ) } } - - static void ImplHandleSalExtTextInputPos( Window* pWindow, SalExtTextInputPosEvent* pEvt ) { Rectangle aCursorRect; @@ -2205,8 +2130,6 @@ static void ImplHandleSalExtTextInputPos( Window* pWindow, SalExtTextInputPosEve } } - - static bool ImplHandleShowDialog( Window* pWindow, int nDialogId ) { if( ! pWindow ) @@ -2222,8 +2145,6 @@ static bool ImplHandleShowDialog( Window* pWindow, int nDialogId ) return ImplCallCommand( pWindow, COMMAND_SHOWDIALOG, &aCmdData ); } - - static void ImplHandleSurroundingTextRequest( Window *pWindow, OUString& rText, Selection &rSelRange ) @@ -2245,8 +2166,6 @@ static void ImplHandleSurroundingTextRequest( Window *pWindow, } } - - static void ImplHandleSalSurroundingTextRequest( Window *pWindow, SalSurroundingTextRequestEvent *pEvt ) { @@ -2270,8 +2189,6 @@ static void ImplHandleSalSurroundingTextRequest( Window *pWindow, pEvt->mnEnd = aSelRange.Max(); } - - static void ImplHandleSurroundingTextSelectionChange( Window *pWindow, sal_uLong nStart, sal_uLong nEnd ) @@ -2284,8 +2201,6 @@ static void ImplHandleSurroundingTextSelectionChange( Window *pWindow, } } - - static void ImplHandleStartReconversion( Window *pWindow ) { Window* pChild = ImplGetKeyInputWindow( pWindow ); @@ -2293,8 +2208,6 @@ static void ImplHandleStartReconversion( Window *pWindow ) ImplCallCommand( pChild, COMMAND_PREPARERECONVERSION ); } - - static void ImplHandleSalQueryCharPosition( Window *pWindow, SalQueryCharPositionEvent *pEvt ) { @@ -2338,8 +2251,6 @@ static void ImplHandleSalQueryCharPosition( Window *pWindow, } } - - bool ImplWindowFrameProc( Window* pWindow, SalFrame* /*pFrame*/, sal_uInt16 nEvent, const void* pEvent ) { |