[Libreoffice-commits] core.git: vcl/CppunitTest_vcl_wmf_test.mk vcl/Library_vcl.mk vcl/win
Caolán McNamara
caolanm at redhat.com
Wed Mar 8 13:34:41 UTC 2017
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 587cf92e5cff091f863227fffa347df875fb86f7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 8 12:22:54 2017 +0000
CIA: unnecessary dll
Change-Id: Icbc3eaff000d90885cf85d8195868e1248493896
Reviewed-on: https://gerrit.libreoffice.org/34972
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/CppunitTest_vcl_wmf_test.mk b/vcl/CppunitTest_vcl_wmf_test.mk
index 27dfe62..f7858f9 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 5949156..b7dad29 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 277b1d85..b51c2f7 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 f5a17ef..0c5e802 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 ) );
More information about the Libreoffice-commits
mailing list