diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-20 14:55:36 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-20 14:55:36 +0000 |
| commit | 66141a46a44fa1c96694e98453e28c077ca23f48 (patch) | |
| tree | d6c87d88193a955b6b06d44d97cec95440fea53b | |
| parent | c6161697084af38f0f6887738eb94a55ba8883ed (diff) | |
CWS-TOOLING: integrate CWS impress163_DEV300
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 267abd002111..25c4657a3391 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -700,6 +700,8 @@ namespace cppcanvas break; case GRADIENT_AXIAL: + // vcl considers center color as start color + ::std::swap(aColors[0],aColors[1]); aTexture.Gradient = xFactory->createAxialHorizontalGradient( aColors, aStops ); break; diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 42bfd5d1d77a..5fa96a9570f5 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -5598,7 +5598,7 @@ static BOOL ImplHandleIMEEndComposition( HWND hWnd ) // ----------------------------------------------------------------------- -static void ImplHandleAppCommand( HWND hWnd, LPARAM lParam ) +static boolean ImplHandleAppCommand( HWND hWnd, LPARAM lParam ) { sal_Int16 nCommand = 0; switch( GET_APPCOMMAND_LPARAM(lParam) ) @@ -5622,7 +5622,7 @@ static void ImplHandleAppCommand( HWND hWnd, LPARAM lParam ) case APPCOMMAND_VOLUME_UP: nCommand = MEDIA_COMMAND_VOLUME_UP; break; break; default: - return; + return false; } WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -5635,8 +5635,13 @@ static void ImplHandleAppCommand( HWND hWnd, LPARAM lParam ) NotifyEvent aNCmdEvt( EVENT_COMMAND, pWindow, &aCEvt ); if ( !ImplCallPreNotify( aNCmdEvt ) ) + { pWindow->Command( aCEvt ); + return true; + } } + + return false; } @@ -6195,7 +6200,11 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP ImplHandleIMENotify( hWnd, wParam ); break; case WM_APPCOMMAND: - ImplHandleAppCommand( hWnd, lParam ); + if( ImplHandleAppCommand( hWnd, lParam ) ) + { + rDef = false; + nRet = 1; + } break; #if WINVER >= 0x0500 case WM_IME_REQUEST: |