Kaydet (Commit) 399af2e8 authored tarafından Dmitriy Shilin's avatar Dmitriy Shilin Kaydeden (comit) Mike Kaganski

tdf#107792 vcl/win/gdi: shrink WinSalGraphicsImpl::MakePen API

Change-Id: I7d5752214a0c2f4891dcc023c6d573a8459b65f4
Reviewed-on: https://gerrit.libreoffice.org/65037
Tested-by: Jenkins
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst 007396b2
...@@ -1347,7 +1347,7 @@ void WinSalGraphicsImpl::SetLineColor(Color nColor) ...@@ -1347,7 +1347,7 @@ void WinSalGraphicsImpl::SetLineColor(Color nColor)
if (hNewPen) if (hNewPen)
bStockPen = true; bStockPen = true;
else else
hNewPen = MakePen(nColor, nPenColor); hNewPen = MakePen(nColor);
ResetPen(hNewPen); ResetPen(hNewPen);
...@@ -1375,8 +1375,12 @@ HPEN WinSalGraphicsImpl::SearchStockPen(COLORREF nPenColor) ...@@ -1375,8 +1375,12 @@ HPEN WinSalGraphicsImpl::SearchStockPen(COLORREF nPenColor)
return nullptr; return nullptr;
} }
HPEN WinSalGraphicsImpl::MakePen(Color nColor, COLORREF nPenColor) HPEN WinSalGraphicsImpl::MakePen(Color nColor)
{ {
COLORREF nPenColor = PALETTERGB(nColor.GetRed(),
nColor.GetGreen(),
nColor.GetBlue());
if (!mrParent.isPrinter()) if (!mrParent.isPrinter())
{ {
if (GetSalData()->mhDitherPal && ImplIsSysColorEntry(nColor)) if (GetSalData()->mhDitherPal && ImplIsSysColorEntry(nColor))
......
...@@ -53,7 +53,7 @@ private: ...@@ -53,7 +53,7 @@ private:
void drawPixelImpl( long nX, long nY, COLORREF crColor ); void drawPixelImpl( long nX, long nY, COLORREF crColor );
HPEN SearchStockPen(COLORREF nPenColor); HPEN SearchStockPen(COLORREF nPenColor);
HPEN MakePen(Color nColor, COLORREF nPenColor); HPEN MakePen(Color nColor);
void ResetPen(HPEN hNewPen); void ResetPen(HPEN hNewPen);
HBRUSH SearchStockBrush(COLORREF nBrushColor); HBRUSH SearchStockBrush(COLORREF nBrushColor);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment