From 86498bcd73050e44ea5ea53c384edb0baf033d16 Mon Sep 17 00:00:00 2001
From: Tomoyuki Kubota <himajin100000@gmail.com>
Date: Sun, 20 Mar 2022 05:07:48 +0100
Subject: [PATCH] tdf#147021 Use std::size() instead of SAL_N_ELEMENTS() macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ibd3f56f6e669a3bb1c1926aa4affdcc46623c81e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131855
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 .../win32/customactions/shellextensions/checkpatches.cxx     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
index 9bad21377b0b..d573161fb11b 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
@@ -20,9 +20,6 @@
 #include "shlxtmsi.hxx"
 #include <strsafe.h>
 #include <systools/win32/uwinapi.h>
-#ifdef DEBUG
-#include <sal/macros.h>
-#endif
 
 #ifdef DEBUG
 inline void OutputDebugStringFormatW( PCWSTR pFormat, ... )
@@ -31,7 +28,7 @@ inline void OutputDebugStringFormatW( PCWSTR pFormat, ... )
     va_list args;
 
     va_start( args, pFormat );
-    StringCchVPrintfW( buffer, SAL_N_ELEMENTS(buffer), pFormat, args );
+    StringCchVPrintfW( buffer, std::size(buffer), pFormat, args );
     OutputDebugStringW( buffer );
     va_end(args);
 }