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

[Andrea Gelmini (via logerrit)]

 vcl/source/window/status.cxx |2 +-
 vcl/win/gdi/winlayout.cxx|1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 3208e9153cfc51eae05bee1af02cbff844e3b3ca
Author: Andrea Gelmini 
AuthorDate: Wed Nov 27 14:38:07 2019 +0100
Commit: Julien Nabet 
CommitDate: Wed Nov 27 15:47:02 2019 +0100

Removed duplicated include

Change-Id: Ibf3142a88def08fd9b531b39bde5643aa8498f7f
Reviewed-on: https://gerrit.libreoffice.org/83908
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index cf264425ae17..7b8f5df30180 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -36,7 +36,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #if HAVE_FEATURE_SKIA
 #include 
commit 6d1089069e9b8d1a58998d9c31dc110bdb5e6093
Author: Andrea Gelmini 
AuthorDate: Wed Nov 27 14:40:48 2019 +0100
Commit: Julien Nabet 
CommitDate: Wed Nov 27 15:46:04 2019 +0100

Fix typo

Change-Id: I3b2cd8942a3a2f7871f296fff884af930e33905c
Reviewed-on: https://gerrit.libreoffice.org/83910
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 8cc26fa95146..e5ba91043c53 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -1348,7 +1348,7 @@ void StatusBar::SetProgressValue( sal_uInt16 nNewPercent )
 
 if (bInvalidate)
 {
-// Rate limit how often we paint, otherwise in some loading scenerios 
we can spend significant
+// Rate limit how often we paint, otherwise in some loading scenarios 
we can spend significant
 // time just painting progress bars.
 sal_uInt32 nTime_ms = osl_getGlobalTimer();
 if ((nTime_ms - mnLastProgressPaint_ms) > 100)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/source/window/window.cxx |2 +-
 vcl/win/app/salinst.cxx  |2 +-
 vcl/win/gdi/salbmp.cxx   |8 ++--
 vcl/win/gdi/salprn.cxx   |2 +-
 vcl/win/window/salframe.cxx  |6 +++---
 5 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit d4bda10ceef4502ce4717368c6a39ecd709cff7f
Author: Stephan Bergmann 
Date:   Mon Jul 17 17:27:02 2017 +0200

loplugin:unnecessaryparen: vcl (clang-cl)

Change-Id: I3d31a5b56007451a9982602b488ae6ac1baf1f50

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 6e35ebac9815..9f31fc185e29 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3580,7 +3580,7 @@ Reference< css::rendering::XCanvas > 
Window::ImplGetCanvas( bool bSpriteCanvas )
 // surfaces spanning multiple displays). Note: canvas
 // (without sprite) stays the same)
 const sal_uInt32 nDisplay = static_cast< WinSalFrame* >( 
mpWindowImpl->mpFrame )->mnDisplay;
-if( (nDisplay >= Application::GetScreenCount()) )
+if( nDisplay >= Application::GetScreenCount() )
 {
 xCanvas.set( xCanvasFactory->createInstanceWithArgumentsAndContext(
  bSpriteCanvas ?
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index 98b59e771c74..e8f1a1fa99fb 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -42,6 +42,10 @@
 #include 
 #include "postwin.h"
 
+#if defined _MSC_VER
+#undef min
+#undef max
+#endif
 
 inline void ImplSetPixel4( sal_uInt8* pScanline, long nX, const BYTE cIndex )
 {
@@ -762,7 +766,7 @@ HGLOBAL WinSalBitmap::ImplCreateDIB( const Size& rSize, 
sal_uInt16 nBits, const
 if( nColors )
 {
 // copy the palette entries if any
-const sal_uInt16 nMinCount = (std::min)( nColors, rPal.GetEntryCount() 
);
+const sal_uInt16 nMinCount = std::min( nColors, rPal.GetEntryCount() );
 if( nMinCount )
 memcpy( pBI->bmiColors, rPal.ImplGetColorBuffer(), nMinCount * 
sizeof(RGBQUAD) );
 }
@@ -944,7 +948,7 @@ void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, 
BitmapAccessMode nMode
 PBITMAPINFO pBI = static_cast(GlobalLock( 
mhDIB ));
 const sal_uInt16nCount = 
pBuffer->maPalette.GetEntryCount();
 const sal_uInt16nDIBColorCount = ImplGetDIBColorCount( 
mhDIB );
-memcpy( pBI->bmiColors, 
pBuffer->maPalette.ImplGetColorBuffer(), (std::min)( nDIBColorCount, nCount ) * 
sizeof( RGBQUAD ) );
+memcpy( pBI->bmiColors, 
pBuffer->maPalette.ImplGetColorBuffer(), std::min( nDIBColorCount, nCount ) * 
sizeof( RGBQUAD ) );
 GlobalUnlock( mhDIB );
 }
 
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 11731ddd657d..44cc665c94b4 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -685,7 +685,7 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* 
pPrinter, ImplJobSetup* pS
 if( nFlags & JobSetFlags::DUPLEXMODE )
 {
 DuplexMode eDuplex = DuplexMode::Unknown;
-if( (pDevModeW->dmFields & DM_DUPLEX) )
+if( pDevModeW->dmFields & DM_DUPLEX )
 {
 if( pDevModeW->dmDuplex == DMDUP_SIMPLEX )
 eDuplex = DuplexMode::Off;
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index b31249db81d2..3c370f50e6b5 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -5817,17 +5817,17 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, 
WPARAM wParam, LPARAM lP
 }
 break;
 case WM_IME_REQUEST:
-if ( (sal_uIntPtr)( wParam ) == IMR_RECONVERTSTRING )
+if ( (sal_uIntPtr)wParam == IMR_RECONVERTSTRING )
 {
 nRet = ImplHandleIMEReconvertString( hWnd, lParam );
 rDef = FALSE;
 }
-else if( (sal_uIntPtr)( wParam ) == IMR_CONFIRMRECONVERTSTRING )
+else if( (sal_uIntPtr)wParam == IMR_CONFIRMRECONVERTSTRING )
 {
 nRet = ImplHandleIMEConfirmReconvertString( hWnd, lParam );
 rDef = FALSE;
 }
-else if ( (sal_uIntPtr)( wParam ) == IMR_QUERYCHARPOSITION )
+else if ( (sal_uIntPtr)wParam == IMR_QUERYCHARPOSITION )
 {
 if ( ImplSalYieldMutexTryToAcquire() )
 {
commit 7243c13bdd4cbc528673b658faea6772077fa1f6
Author: Stephan Bergmann 
Date:   Mon Jul 17 17:26:08 2017 +0200

loplugin:implicitboolconversion: vcl (clang-cl)

Change-Id: I81ae357574e5020a5e2dfb7162d451b985c18766

diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 3b29cf820b01..d6a970e7eca8 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -210,7 +210,7 @@ void ImplSalYieldMutexAcquireWithWait( sal_uLong nCount )