diff options
| author | Philipp Hofer <philipp.hofer@protonmail.com> | 2020-11-12 13:14:53 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-11-19 19:28:45 +0100 |
| commit | 2d72bc353b9d086e3eb3f9cf00a034c86f13ca21 (patch) | |
| tree | 87be3a61ab4a4270fd5b149be2d6ca86508a321b /setup_native | |
| parent | 156da5b55362db37d4e61a22e43e489e48797452 (diff) | |
tdf#123936 Formatting files in module setup_native with clang-format
Change-Id: I40c25e54b1348a17d4e639a77a1834462c8a5c27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105705
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx | 10 | ||||
| -rw-r--r-- | setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx b/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx index 68faed45aac7..c600329ee659 100644 --- a/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx +++ b/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx @@ -21,19 +21,19 @@ #include <shlobj.h> -extern "C" __declspec(dllexport) UINT __stdcall RemoveQuickstarterLink( MSIHANDLE hMSI ) +extern "C" __declspec(dllexport) UINT __stdcall RemoveQuickstarterLink(MSIHANDLE hMSI) { - WCHAR szStartupPath[MAX_PATH]; + WCHAR szStartupPath[MAX_PATH]; - if ( SHGetSpecialFolderPathW( nullptr, szStartupPath, CSIDL_STARTUP, FALSE ) ) + if (SHGetSpecialFolderPathW(nullptr, szStartupPath, CSIDL_STARTUP, FALSE)) { std::wstring sQuickstartLinkPath = szStartupPath; sQuickstartLinkPath += L"\\"; - sQuickstartLinkPath += GetQuickstarterLinkNameW( hMSI ); + sQuickstartLinkPath += GetQuickstarterLinkNameW(hMSI); sQuickstartLinkPath += L".lnk"; - DeleteFileW( sQuickstartLinkPath.c_str() ); + DeleteFileW(sQuickstartLinkPath.c_str()); } return ERROR_SUCCESS; diff --git a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx index 5c68659950ef..8e4166b0d95d 100644 --- a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx +++ b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx @@ -37,7 +37,7 @@ extern "C" __declspec(dllexport) UINT __stdcall CheckInstallDirectory(MSIHANDLE // unsetting all properties - UnsetMsiPropertyW( handle, L"DIRECTORY_NOT_EMPTY" ); + UnsetMsiPropertyW(handle, L"DIRECTORY_NOT_EMPTY"); // 1. Searching for file setup.ini @@ -49,11 +49,11 @@ extern "C" __declspec(dllexport) UINT __stdcall CheckInstallDirectory(MSIHANDLE // std::wstring mystr = L"Searching for " + sSetupIniPath; // MessageBoxW(NULL, mystr.c_str(), L"DEBUG", MB_OK); - if ( IsValidHandle(hdl) ) + if (IsValidHandle(hdl)) { // setup.ini found -> directory cannot be used for installation. - SetMsiPropertyW( handle, L"DIRECTORY_NOT_EMPTY", L"1" ); - SetMsiErrorCode( MSI_ERROR_DIRECTORY_NOT_EMPTY ); + SetMsiPropertyW(handle, L"DIRECTORY_NOT_EMPTY", L"1"); + SetMsiErrorCode(MSI_ERROR_DIRECTORY_NOT_EMPTY); // std::wstring notEmptyStr = L"Directory is not empty. Please choose another installation directory."; // std::wstring notEmptyTitle = L"Directory not empty"; // MessageBoxW(NULL, notEmptyStr.c_str(), notEmptyTitle.c_str(), MB_OK); |