summaryrefslogtreecommitdiff
path: root/desktop/win32
diff options
context:
space:
mode:
authorFlorian Bircher <florian.bi@gmx.net>2010-10-18 18:54:59 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2010-10-18 18:54:59 -0500
commit86ec8c1520e2a2354707445b3182f3371df522ac (patch)
tree45a6a19126888c3ccd7094847ef73d69eda1f607 /desktop/win32
parent6a007ed1754b45ab00c3021dc3724edea53f1ed1 (diff)
use SAL_N_ELEMENTS
Diffstat (limited to 'desktop/win32')
-rw-r--r--desktop/win32/source/guistdio/guistdio.inc4
-rw-r--r--desktop/win32/source/officeloader/officeloader.cxx10
2 files changed, 7 insertions, 7 deletions
diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc
index 7009b24a0d..05d462d231 100644
--- a/desktop/win32/source/guistdio/guistdio.inc
+++ b/desktop/win32/source/guistdio/guistdio.inc
@@ -411,13 +411,13 @@ int _tmain( int, _TCHAR ** )
};
#ifdef UNOPKG
- dwWaitResult = WaitForMultipleObjects( elementsof(hObjects), hObjects, TRUE, INFINITE );
+ dwWaitResult = WaitForMultipleObjects( SAL_N_ELEMENTS(hObjects), hObjects, TRUE, INFINITE );
#else
bool bDetach = false;
int nOpenPipes = 2;
do
{
- dwWaitResult = WaitForMultipleObjects( elementsof(hObjects), hObjects, FALSE, INFINITE );
+ dwWaitResult = WaitForMultipleObjects( SAL_N_ELEMENTS(hObjects), hObjects, FALSE, INFINITE );
switch ( dwWaitResult )
{
diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx
index c5e34dce08..cce56b05a6 100644
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -230,7 +230,7 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
TEXT("FastPipeCommunication"),
TEXT("0"),
szKey,
- elementsof(szKey),
+ SAL_N_ELEMENTS(szKey),
szPerfTuneIniFile
);
@@ -258,10 +258,10 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
fSuccess = ConvertSidToStringSid( pSid, &szUserIdent );
- _tcsncpy( szPipeName, PIPE_PREFIX, elementsof(szPipeName) );
- _tcsncat( szPipeName, szUserIdent, elementsof(szPipeName) - _tcslen(szPipeName) - 1 );
- _tcsncat( szPipeName, PIPE_POSTFIX, elementsof(szPipeName) - _tcslen(szPipeName) - 1 );
- _tcsncat( szPipeName, _ultot( SUPD, szSUPD, 10), elementsof(szPipeName) - _tcslen(szPipeName) - 1 );
+ _tcsncpy( szPipeName, PIPE_PREFIX, SAL_N_ELEMENTS(szPipeName) );
+ _tcsncat( szPipeName, szUserIdent, SAL_N_ELEMENTS(szPipeName) - _tcslen(szPipeName) - 1 );
+ _tcsncat( szPipeName, PIPE_POSTFIX, SAL_N_ELEMENTS(szPipeName) - _tcslen(szPipeName) - 1 );
+ _tcsncat( szPipeName, _ultot( SUPD, szSUPD, 10), SAL_N_ELEMENTS(szPipeName) - _tcslen(szPipeName) - 1 );
LocalFree( szUserIdent );