[Libreoffice-commits] core.git: vcl/win

[Libreoffice Gerrit user]

 vcl/win/gdi/gdiimpl.cxx |    8 ++++++--
 vcl/win/gdi/gdiimpl.hxx |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 399af2e8cb3b80555194b4a6186fe9deabeac95d
Author:     Dmitriy Shilin <dshil at fastmail.com>
AuthorDate: Wed Dec 12 17:24:41 2018 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu Dec 13 06:17:12 2018 +0100

    tdf#107792 vcl/win/gdi: shrink WinSalGraphicsImpl::MakePen API
    
    Change-Id: I7d5752214a0c2f4891dcc023c6d573a8459b65f4
    Reviewed-on: https://gerrit.libreoffice.org/65037
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 47548b4129b3..b8fafc25482d 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -1347,7 +1347,7 @@ void WinSalGraphicsImpl::SetLineColor(Color nColor)
     if (hNewPen)
         bStockPen = true;
     else
-        hNewPen = MakePen(nColor, nPenColor);
+        hNewPen = MakePen(nColor);
 
     ResetPen(hNewPen);
 
@@ -1375,8 +1375,12 @@ HPEN WinSalGraphicsImpl::SearchStockPen(COLORREF nPenColor)
     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 (GetSalData()->mhDitherPal && ImplIsSysColorEntry(nColor))
diff --git a/vcl/win/gdi/gdiimpl.hxx b/vcl/win/gdi/gdiimpl.hxx
index 6bee309e6ec1..295f474740f8 100644
--- a/vcl/win/gdi/gdiimpl.hxx
+++ b/vcl/win/gdi/gdiimpl.hxx
@@ -53,7 +53,7 @@ private:
     void drawPixelImpl( long nX, long nY, COLORREF crColor );
 
     HPEN SearchStockPen(COLORREF nPenColor);
-    HPEN MakePen(Color nColor, COLORREF nPenColor);
+    HPEN MakePen(Color nColor);
     void ResetPen(HPEN hNewPen);
 
     HBRUSH SearchStockBrush(COLORREF nBrushColor);