diff options
Diffstat (limited to 'setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx')
-rw-r--r-- | setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx b/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx index ffd6ef1a87dd..2cea3de247ec 100644 --- a/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx +++ b/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ using namespace std; -namespace +namespace { string GetMsiProperty(MSIHANDLE handle, const string& sProperty) { @@ -121,7 +121,7 @@ Order compareVersions(string const & version1, string const & version2) { if (e1.size() < e2.size()) { return ORDER_LESS; - } else if (e1.size() > e2.size()) { + } else if (e1.size() > e2.size()) { return ORDER_GREATER; } else if (e1 < e2) { return ORDER_LESS; @@ -132,7 +132,7 @@ Order compareVersions(string const & version1, string const & version2) { return ORDER_EQUAL; } -} // namespace +} // namespace extern "C" UINT __stdcall DotNetCheck(MSIHANDLE handle) { string present(GetMsiProperty(handle, TEXT("MsiNetAssemblySupport"))); @@ -151,34 +151,34 @@ extern "C" UINT __stdcall DotNetCheck(MSIHANDLE handle) { // string result(GetMsiProperty(handle, TEXT("DOTNET_SUFFICIENT"))); // string myText3 = TEXT("DOTNET_SUFFICIENT: ") + result; // MessageBox(NULL, myText3.c_str(), "DEBUG", MB_OK); + - - return ERROR_SUCCESS; + return ERROR_SUCCESS; } extern "C" UINT __stdcall ShowProperties(MSIHANDLE handle) { - string property = GetMsiProperty(handle, TEXT("INSTALLLOCATION")); + string property = GetMsiProperty(handle, TEXT("INSTALLLOCATION")); string myText = TEXT("INSTALLLOCATION: ") + property; MessageBox(NULL, myText.c_str(), "INSTALLLOCATION", MB_OK); - property = GetMsiProperty(handle, TEXT("Installed")); + property = GetMsiProperty(handle, TEXT("Installed")); myText = TEXT("Installed: ") + property; MessageBox(NULL, myText.c_str(), "Installed", MB_OK); - property = GetMsiProperty(handle, TEXT("PATCH")); + property = GetMsiProperty(handle, TEXT("PATCH")); myText = TEXT("PATCH: ") + property; MessageBox(NULL, myText.c_str(), "PATCH", MB_OK); - property = GetMsiProperty(handle, TEXT("REMOVE")); + property = GetMsiProperty(handle, TEXT("REMOVE")); myText = TEXT("REMOVE: ") + property; MessageBox(NULL, myText.c_str(), "REMOVE", MB_OK); - property = GetMsiProperty(handle, TEXT("ALLUSERS")); + property = GetMsiProperty(handle, TEXT("ALLUSERS")); myText = TEXT("ALLUSERS: ") + property; MessageBox(NULL, myText.c_str(), "ALLUSERS", MB_OK); - - return ERROR_SUCCESS; + + return ERROR_SUCCESS; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |