diff options
| -rw-r--r-- | setup_native/source/win32/customactions/shellextensions/layerlinks.cxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx index a8e567826972..2315fdc7c3e3 100644 --- a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx +++ b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx @@ -110,18 +110,9 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle) if ( IsSetMsiProperty(handle, TEXT("ADMININSTALL")) ) { - string sOooBaseVersion = GetMsiProperty(handle, TEXT("OOOBASEVERSION")); - string sBasisRootName = GetMsiProperty(handle, TEXT("BASISROOTNAME")); - if ( IsSetMsiProperty(handle, TEXT("SUNDIREXISTS")) ) - { - sBasisInstallPath = TEXT("..\\..\\") + sBasisRootName + TEXT("\\Basis ") + sOooBaseVersion; - } - else - { - sBasisInstallPath = TEXT("..\\") + sBasisRootName + TEXT("\\Basis ") + sOooBaseVersion; - } + sBasisInstallPath = TEXT("Basis"); sUreInstallPath = TEXT("..\\URE"); - } + } stripFinalBackslash(&sBasisInstallPath); stripFinalBackslash(&sUreInstallPath); |