diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-14 16:57:24 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-16 14:19:22 +0000 |
| commit | 08abfef116d893d6a062d432ff89e7af8b7b679d (patch) | |
| tree | dc6f12f1669b40651a42b7a0556e264bc607a42b /desktop/source/deployment | |
| parent | 1f9b6013e507ee4acb9374cee909f59139d52978 (diff) | |
clang-cl loplugin: desktop
Change-Id: If2f5bfa6c05098c5362cd6c7b546520dc01ee821
Reviewed-on: https://gerrit.libreoffice.org/29871
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop/source/deployment')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/dp_misc.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/lockfile.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 7105f899f384..8409ca9bcf1c 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -682,7 +682,7 @@ void ExtensionCmdQueue::Thread::execute() //Needed for use of the service "com.sun.star.system.SystemShellExecute" in //DialogHelper::openWebBrowser CoUninitialize(); - (void) CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + (void) CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); #endif for (;;) { diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 3bb4ec041a40..01f1ab95dca1 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -471,7 +471,7 @@ void writeConsoleWithStream(OUString const & sText, HANDLE stream) { DWORD nWrittenChars = 0; WriteFile(stream, sText.getStr(), - sText.getLength() * 2, &nWrittenChars, NULL); + sText.getLength() * 2, &nWrittenChars, nullptr); } #else void writeConsoleWithStream(OUString const & sText, FILE * stream) @@ -506,7 +506,7 @@ OUString readConsole() sal_Unicode aBuffer[1024]; DWORD dwRead = 0; //unopkg.com feeds unopkg.exe with wchar_t|s - if (ReadFile( GetStdHandle(STD_INPUT_HANDLE), &aBuffer, sizeof(aBuffer), &dwRead, NULL ) ) + if (ReadFile( GetStdHandle(STD_INPUT_HANDLE), &aBuffer, sizeof(aBuffer), &dwRead, nullptr ) ) { OSL_ASSERT((dwRead % 2) == 0); OUString value( aBuffer, dwRead / 2); diff --git a/desktop/source/deployment/misc/lockfile.cxx b/desktop/source/deployment/misc/lockfile.cxx index f33cd703fa5d..fa30bf256fee 100644 --- a/desktop/source/deployment/misc/lockfile.cxx +++ b/desktop/source/deployment/misc/lockfile.cxx @@ -46,9 +46,9 @@ static OString impl_getHostname() prevent windows from connecting to the net to get its own hostname by using the netbios name */ - sal_Int32 sz = MAX_COMPUTERNAME_LENGTH + 1; + DWORD sz = MAX_COMPUTERNAME_LENGTH + 1; char* szHost = new char[sz]; - if (GetComputerName(szHost, (LPDWORD)&sz)) + if (GetComputerName(szHost, &sz)) aHost = OString(szHost); else aHost = OString("UNKNOWN"); |