diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-06 10:19:56 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-06 10:19:56 +0000 |
| commit | c48e46120c36823211f0f2bcf8628d5162c14533 (patch) | |
| tree | c871ad5ebf83b67d3891f278c595cd8db86eb7d8 /setup_native/source | |
| parent | a1e0b35f1f411c90b67eb6fdcbc4772dedb79efe (diff) | |
INTEGRATION: CWS native34 (1.6.6); FILE MERGED
2005/12/14 15:59:35 is 1.6.6.1: #127719# smaller patchlist.txt
Diffstat (limited to 'setup_native/source')
| -rwxr-xr-x | setup_native/source/win32/customactions/patch/swappatchfiles.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx index 926752756..8ef747569 100755 --- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx +++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx @@ -4,9 +4,9 @@ * * $RCSfile: swappatchfiles.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2005-11-23 16:22:00 $ + * last change: $Author: kz $ $Date: 2006-01-06 11:19:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -249,6 +249,7 @@ extern "C" UINT __stdcall InstallPatchedFiles( MSIHANDLE handle ) while ( *pSectionName ) { std::_tstring sSectionName = pSectionName; + if ( std::_tstring(TEXT("_root")) == sSectionName ) { sSectionName = TEXT(""); } // mystr = "Section: " + sSectionName; // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK ); @@ -269,7 +270,7 @@ extern "C" UINT __stdcall InstallPatchedFiles( MSIHANDLE handle ) sFileName1 = strip( sFileName1, '\"' ); sExtension = strip( sExtension, '\"' ); - sFileName1 = sInstDir + sFileName1; + sFileName1 = sInstDir + sSectionName + sFileName1; sFileName2 = sFileName1 + sExtension; // mystr = "Convert: " + sFileName1 + " to " + sFileName2; @@ -335,6 +336,7 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle ) while ( *pSectionName ) { std::_tstring sSectionName = pSectionName; + if ( std::_tstring(TEXT("_root")) == sSectionName ) { sSectionName = TEXT(""); } // mystr = "Section: " + sSectionName; // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK ); @@ -355,7 +357,7 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle ) sFileName1 = strip( sFileName1, '\"' ); sExtension = strip( sExtension, '\"' ); - sFileName1 = sInstDir + sFileName1; + sFileName1 = sInstDir + sSectionName + sFileName1; sFileName2 = sFileName1 + sExtension; // mystr = "Convert: " + sFileName1 + " to " + sFileName2; |