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

[Libreoffice Gerrit user]

 vcl/win/gdi/gdiimpl.cxx |   14 +++++++-------
 vcl/win/gdi/gdiimpl.hxx |    4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 718c9b8a42987dd19252d539c38909305839c946
Author:     Dmitriy Shilin <dshil at fastmail.com>
AuthorDate: Fri Dec 14 08:21:31 2018 +0300
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Dec 20 13:20:23 2018 +0100

    vcl/win/gdi: unify private API naming in WinSalGraphicsImpl
    
    Change-Id: I0279e8796c750678607b3db8b3e209110d41cfd7
    Reviewed-on: https://gerrit.libreoffice.org/65140
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index eecd9f350164..e99e84bc4030 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -647,7 +647,7 @@ void WinSalGraphicsImpl::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap&
     }
 
     // try to draw using GdiPlus directly
-    if(bTryDirectPaint && tryDrawBitmapGdiPlus(rPosAry, rSalBitmap))
+    if(bTryDirectPaint && TryDrawBitmapGDIPlus(rPosAry, rSalBitmap))
     {
         return;
     }
@@ -1573,7 +1573,7 @@ void WinSalGraphicsImpl::SetROPFillColor( SalROPColor nROPColor )
     SetFillColor( ImplGetROPColor( nROPColor ) );
 }
 
-void WinSalGraphicsImpl::drawPixelImpl( long nX, long nY, COLORREF crColor )
+void WinSalGraphicsImpl::DrawPixelImpl( long nX, long nY, COLORREF crColor )
 {
     if ( mbXORMode )
     {
@@ -1589,7 +1589,7 @@ void WinSalGraphicsImpl::drawPixelImpl( long nX, long nY, COLORREF crColor )
 
 void WinSalGraphicsImpl::drawPixel( long nX, long nY )
 {
-    drawPixelImpl( nX, nY, mnPenColor );
+    DrawPixelImpl( nX, nY, mnPenColor );
 }
 
 void WinSalGraphicsImpl::drawPixel( long nX, long nY, Color nColor )
@@ -1603,7 +1603,7 @@ void WinSalGraphicsImpl::drawPixel( long nX, long nY, Color nColor )
          ImplIsSysColorEntry( nColor ) )
         nCol = PALRGB_TO_RGB( nCol );
 
-    drawPixelImpl( nX, nY, nCol );
+    DrawPixelImpl( nX, nY, nCol );
 }
 
 void WinSalGraphicsImpl::drawLine( long nX1, long nY1, long nX2, long nY2 )
@@ -1614,7 +1614,7 @@ void WinSalGraphicsImpl::drawLine( long nX1, long nY1, long nX2, long nY2 )
 
     // LineTo doesn't draw the last pixel
     if ( !mrParent.isPrinter() )
-        drawPixelImpl( nX2, nY2, mnPenColor );
+        DrawPixelImpl( nX2, nY2, mnPenColor );
 }
 
 void WinSalGraphicsImpl::drawRect( long nX, long nY, long nWidth, long nHeight )
@@ -1653,7 +1653,7 @@ void WinSalGraphicsImpl::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAr
 
     // Polyline seems to uses LineTo, which doesn't paint the last pixel (see 87eb8f8ee)
     if ( !mrParent.isPrinter() )
-        drawPixelImpl( pWinPtAry[nPoints-1].x, pWinPtAry[nPoints-1].y, mnPenColor );
+        DrawPixelImpl( pWinPtAry[nPoints-1].x, pWinPtAry[nPoints-1].y, mnPenColor );
 }
 
 void WinSalGraphicsImpl::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
@@ -2418,7 +2418,7 @@ static void setInterpolationMode(
     }
 }
 
-bool WinSalGraphicsImpl::tryDrawBitmapGdiPlus(const SalTwoRect& rTR, const SalBitmap& rSrcBitmap)
+bool WinSalGraphicsImpl::TryDrawBitmapGDIPlus(const SalTwoRect& rTR, const SalBitmap& rSrcBitmap)
 {
     if(rTR.mnSrcWidth && rTR.mnSrcHeight && rTR.mnDestWidth && rTR.mnDestHeight)
     {
diff --git a/vcl/win/gdi/gdiimpl.hxx b/vcl/win/gdi/gdiimpl.hxx
index 295f474740f8..f1cd729daf1b 100644
--- a/vcl/win/gdi/gdiimpl.hxx
+++ b/vcl/win/gdi/gdiimpl.hxx
@@ -49,8 +49,8 @@ private:
     Color                maLineColor;
     Color                maFillColor;
 
-    bool tryDrawBitmapGdiPlus(const SalTwoRect& rTR, const SalBitmap& rSrcBitmap);
-    void drawPixelImpl( long nX, long nY, COLORREF crColor );
+    bool TryDrawBitmapGDIPlus(const SalTwoRect& rTR, const SalBitmap& rSrcBitmap);
+    void DrawPixelImpl(long nX, long nY, COLORREF crColor);
 
     HPEN SearchStockPen(COLORREF nPenColor);
     HPEN MakePen(Color nColor);