diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-08 12:22:54 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-08 13:33:48 +0000 |
| commit | 587cf92e5cff091f863227fffa347df875fb86f7 (patch) | |
| tree | 4263dc4a8d4938fff740861e45b7859472aa5315 /vcl | |
| parent | c1723a3b66aabbbfacce6f66d370d09067b7ed27 (diff) | |
CIA: unnecessary dll
Change-Id: Icbc3eaff000d90885cf85d8195868e1248493896
Reviewed-on: https://gerrit.libreoffice.org/34972
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/CppunitTest_vcl_wmf_test.mk | 1 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 1 | ||||
| -rw-r--r-- | vcl/win/gdi/gdiimpl.cxx | 6 | ||||
| -rw-r--r-- | vcl/win/gdi/salnativewidgets-luna.cxx | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/vcl/CppunitTest_vcl_wmf_test.mk b/vcl/CppunitTest_vcl_wmf_test.mk index 27dfe62f6b2c..f7858f9ddf19 100644 --- a/vcl/CppunitTest_vcl_wmf_test.mk +++ b/vcl/CppunitTest_vcl_wmf_test.mk @@ -166,7 +166,6 @@ $(eval $(call gb_CppunitTest_use_system_win32_libs,vcl_wmf_test,\ gdiplus \ imm32 \ mpr \ - msimg32 \ ole32 \ shell32 \ usp10 \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 5949156e20f0..b7dad29a3f80 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -708,7 +708,6 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\ gdiplus \ imm32 \ mpr \ - msimg32 \ ole32 \ shell32 \ usp10 \ diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx index 277b1d85b94e..b51c2f700a7d 100644 --- a/vcl/win/gdi/gdiimpl.cxx +++ b/vcl/win/gdi/gdiimpl.cxx @@ -811,9 +811,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 f5a17ef33538..0c5e80253e05 100644 --- a/vcl/win/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/gdi/salnativewidgets-luna.cxx @@ -448,7 +448,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 @@ -456,7 +456,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 ) ); |