vcl/CppunitTest_vcl_wmf_test.mk | 1 - vcl/Library_vcl.mk | 1 - vcl/win/gdi/gdiimpl.cxx | 6 +++--- vcl/win/gdi/salnativewidgets-luna.cxx | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-)
New commits: commit ef58999df39ed665e34a87574b370a338c1ef9a4 Author: Caolán McNamara <[email protected]> Date: Wed Mar 8 12:22:54 2017 +0000 CIA: unnecessary dll Reviewed-on: https://gerrit.libreoffice.org/34972 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit 587cf92e5cff091f863227fffa347df875fb86f7) Change-Id: Icbc3eaff000d90885cf85d8195868e1248493896 Reviewed-on: https://gerrit.libreoffice.org/34974 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/vcl/CppunitTest_vcl_wmf_test.mk b/vcl/CppunitTest_vcl_wmf_test.mk index 369c792..44d6851 100644 --- a/vcl/CppunitTest_vcl_wmf_test.mk +++ b/vcl/CppunitTest_vcl_wmf_test.mk @@ -172,7 +172,6 @@ $(eval $(call gb_CppunitTest_use_system_win32_libs,vcl_wmf_test,\ glu32 \ imm32 \ mpr \ - msimg32 \ opengl32 \ ole32 \ shell32 \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index f552b55..a52938b 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -732,7 +732,6 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\ glu32 \ imm32 \ mpr \ - msimg32 \ opengl32 \ ole32 \ shell32 \ diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx index 82c03ff..237aef5 100644 --- a/vcl/win/gdi/gdiimpl.cxx +++ b/vcl/win/gdi/gdiimpl.cxx @@ -816,9 +816,9 @@ bool WinSalGraphicsImpl::drawAlphaRect( long nX, long nY, long nWidth, // hMemDC contains a 1x1 bitmap of the right color - stretch-blit // that to dest hdc - bool bRet = AlphaBlend( mrParent.getHDC(), nX, nY, nWidth, nHeight, - hMemDC, 0,0,1,1, - aFunc ) == TRUE; + bool bRet = GdiAlphaBlend(mrParent.getHDC(), nX, nY, nWidth, nHeight, + hMemDC, 0,0,1,1, + aFunc ) == TRUE; ImplReleaseCachedDC( CACHED_HDC_1 ); diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx b/vcl/win/gdi/salnativewidgets-luna.cxx index 23fa61a..3491ebf 100644 --- a/vcl/win/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/gdi/salnativewidgets-luna.cxx @@ -461,7 +461,7 @@ static void impl_drawAeroToolbar( HDC hDC, RECT rc, bool bHorizontal ) { rc.left, rc.top, 0xff00, 0xff00, 0xff00, 0xff00 }, { rc.right, gradient_break, 0xfa00, 0xfa00, 0xfa00, 0xff00 }, }; - GradientFill( hDC, vert, 2, g_rect, 1, GRADIENT_FILL_RECT_V ); + GdiGradientFill( hDC, vert, 2, g_rect, 1, GRADIENT_FILL_RECT_V ); } // gradient at the bottom @@ -469,7 +469,7 @@ static void impl_drawAeroToolbar( HDC hDC, RECT rc, bool bHorizontal ) { rc.left, gradient_break, 0xfa00, 0xfa00, 0xfa00, 0xff00 }, { rc.right, gradient_bottom, 0xf000, 0xf000, 0xf000, 0xff00 } }; - GradientFill( hDC, vert, 2, g_rect, 1, GRADIENT_FILL_RECT_V ); + GdiGradientFill( hDC, vert, 2, g_rect, 1, GRADIENT_FILL_RECT_V ); // and a darker horizontal line under that HPEN hpen = CreatePen( PS_SOLID, 1, RGB( 0xb0, 0xb0, 0xb0 ) );
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
