setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx
| 10 +++++-----
setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
| 8 ++++----
solenv/clang-format/excludelist
| 2 --
3 files changed, 9 insertions(+), 11 deletions(-)
New commits:
commit 2d72bc353b9d086e3eb3f9cf00a034c86f13ca21
Author: Philipp Hofer <philipp.ho...@protonmail.com>
AuthorDate: Thu Nov 12 13:14:53 2020 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Thu Nov 19 19:28:45 2020 +0100
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+libreoff...@googlemail.com>
Tested-by: Jenkins
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);
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 07cd34532515..c92305942951 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -11078,12 +11078,10 @@ sdext/source/presenter/PresenterWindowManager.cxx
sdext/source/presenter/PresenterWindowManager.hxx
setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
setup_native/source/win32/customactions/quickstarter/quickstarter.cxx
-setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx
setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
setup_native/source/win32/customactions/regactivex/regactivex.cxx
setup_native/source/win32/customactions/sellang/sellang.cxx
-setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
