diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-21 12:21:56 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-24 13:59:56 +0200 |
| commit | 3fce44fbe9adacdd163599763c2f94e560bbeaa9 (patch) | |
| tree | 4d3476bae1231327df2f465796eef62e30442e3c /setup_native | |
| parent | a32d05fbb9fa8c1062294e7bd75588dc152309a3 (diff) | |
Undo basis/brand split: Moved WNT-specific patchlist.txt etc.
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/source/win32/customactions/patch/swappatchfiles.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx index 07e9bc28bf20..1b576320533c 100644 --- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx +++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx @@ -466,7 +466,7 @@ static std::queue< std::_tstring > getProfileKeys( const std::_tstring& aFileNam extern "C" UINT __stdcall InstallPatchedFiles( MSIHANDLE handle ) { std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") ); - std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\"); + std::_tstring sProgramDir = sInstDir + TEXT("program\\"); std::_tstring sPatchFile = sProgramDir + TEXT("patchlist.txt"); std::queue< std::_tstring > aSectionNames; @@ -539,7 +539,7 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle ) else return ERROR_SUCCESS; - std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\"); + std::_tstring sProgramDir = sInstDir + TEXT("program\\"); std::_tstring sPatchFile = sProgramDir + TEXT("patchlist.txt"); std::queue< std::_tstring > aSectionNames; @@ -584,7 +584,7 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle ) extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle ) { std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") ); - std::_tstring sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\"); + std::_tstring sResourceDir = sInstDir + TEXT("program\\resource\\"); std::_tstring sPattern = sResourceDir + TEXT("vcl*.res"); WIN32_FIND_DATA aFindFileData; @@ -740,7 +740,7 @@ extern "C" UINT __stdcall ShowOnlineUpdateDialog( MSIHANDLE handle ) // that offers the Online Update is superfluous. std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") ); - std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\"); + std::_tstring sProgramDir = sInstDir + TEXT("program\\"); std::_tstring sSearchFile = sProgramDir + TEXT("updchk.uno.dll"); WIN32_FIND_DATA data; |