diff options
| author | Pierre-André Jacquod <pjacquod@alumni.ethz.ch> | 2011-09-09 21:26:21 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-12 10:21:11 +0300 |
| commit | 03369ebd2d613238e0c1e47c91dcd57f787a764d (patch) | |
| tree | 67a80a263ca94c2794d0c8c824ed0e5c6a3a59ea /setup_native | |
| parent | 8039e149f8362d524e4a563911d99ace043437db (diff) | |
deletion of unneded variable in setup_native, swappatchfiles.cxx
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/source/win32/customactions/patch/swappatchfiles.cxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx index db7fbeb3e5fc..5028a5fda502 100644 --- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx +++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx @@ -691,7 +691,6 @@ extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle ) extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle ) { - std::_tstring mystr; // 1. Reading Product Code from setup.ini of installed Office @@ -719,7 +718,6 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle ) std::_tstring productCode = TEXT(szProductCode); productCode = ConvertGuid(std::_tstring(productCode.c_str() + 1, productCode.length() - 2)); - mystr = TEXT("Changed product code: ") + productCode; // 3. Setting path in the Windows registry to find installed features @@ -730,13 +728,11 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle ) { registryRoot = HKEY_LOCAL_MACHINE; registryKey = TEXT("Software\\Classes\\Installer\\Features\\") + productCode; - mystr = registryKey; } else { registryRoot = HKEY_CURRENT_USER; registryKey = TEXT("Software\\Microsoft\\Installer\\Features\\") + productCode; - mystr = registryKey; } // 4. Collecting all installed features from Windows registry @@ -760,7 +756,6 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle ) if ( ERROR_SUCCESS == lEnumResult ) { std::_tstring sValueName = szValueName; - std::_tstring sValueData = szValueData; // Does this feature exist in this patch? if ( IsSetMsiProperty(handle, sValueName) ) |