diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-03-29 11:38:42 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-03-29 11:38:42 +0200 |
| commit | b45c3747d17fcdb37cf024712957b218fa5907c4 (patch) | |
| tree | a95f8b9c2d1f6fe0739e736f65d7c7072c32f4b6 /desktop | |
| parent | 4944695115f8cb6fda88031ca68209b6d509d066 (diff) | |
native0: #161436# fix mac user migration - transplanted from f7773ad1d0b9@native0
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/migration/migration.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index f60e7162a046..2181daab7454 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -388,7 +388,7 @@ install_info MigrationImpl::findInstallation(const strings_v& rVersions) osl::Security().getConfigDir( aUserInst ); if ( aUserInst.getLength() && aUserInst[ aUserInst.getLength()-1 ] != '/' ) aUserInst += ::rtl::OUString::createFromAscii("/"); -#ifdef UNX +#if defined UNX && ! defined MACOSX // tribute to whoever had the "great" idea to use different names on Windows and Unix aUserInst += ::rtl::OUString::createFromAscii("."); #endif @@ -403,7 +403,7 @@ install_info MigrationImpl::findInstallation(const strings_v& rVersions) } catch( uno::Exception& ){} } - i_ver++; + ++i_ver; } return aInfo; @@ -425,6 +425,7 @@ sal_Int32 MigrationImpl::findPreferedMigrationProcess(const migrations_available break; } ++i; + ++rIter; } return nIndex; |