mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CWS-TOOLING: integrate CWS impress163_DEV300

Browse Source
This commit is contained in:
Jens-Heiner Rechtien 2008-11-20 14:55:36 +00:00
parent c616169708
commit 66141a46a4
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cppcanvas/source/mtfrenderer/implrenderer.cxx
View File

@ -700,6 +700,8 @@ namespace cppcanvas
break; break;
case GRADIENT_AXIAL: case GRADIENT_AXIAL:
// vcl considers center color as start color
::std::swap(aColors[0],aColors[1]);
aTexture.Gradient = xFactory->createAxialHorizontalGradient( aColors, aTexture.Gradient = xFactory->createAxialHorizontalGradient( aColors,
aStops ); aStops );
break; break;

15
vcl/win/source/window/salframe.cxx
View File

@ -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; sal_Int16 nCommand = 0;
switch( GET_APPCOMMAND_LPARAM(lParam) ) 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; case APPCOMMAND_VOLUME_UP: nCommand = MEDIA_COMMAND_VOLUME_UP; break;
break; break;
default: default:
return; return false;
} }
WinSalFrame* pFrame = GetWindowPtr( hWnd ); WinSalFrame* pFrame = GetWindowPtr( hWnd );
@ -5635,8 +5635,13 @@ static void ImplHandleAppCommand( HWND hWnd, LPARAM lParam )
NotifyEvent aNCmdEvt( EVENT_COMMAND, pWindow, &aCEvt ); NotifyEvent aNCmdEvt( EVENT_COMMAND, pWindow, &aCEvt );
if ( !ImplCallPreNotify( aNCmdEvt ) ) if ( !ImplCallPreNotify( aNCmdEvt ) )
{
pWindow->Command( aCEvt ); 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 ); ImplHandleIMENotify( hWnd, wParam );
break; break;
case WM_APPCOMMAND: case WM_APPCOMMAND:
ImplHandleAppCommand( hWnd, lParam ); if( ImplHandleAppCommand( hWnd, lParam ) )
{
rDef = false;
nRet = 1;
}
break; break;
#if WINVER >= 0x0500 #if WINVER >= 0x0500
case WM_IME_REQUEST: case WM_IME_REQUEST: