diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-03-04 13:45:22 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-03-04 13:45:22 +0100 |
| commit | afc4751875ec560e49ce0c5832fb382f7b5a4787 (patch) | |
| tree | 5e86c4930427c786e277991af2243ec364a20ee1 | |
| parent | 96acd978fbe1d24ce73920ad6d27c4b472fad3c4 (diff) | |
native0: #161436# fix mac user migration
| -rw-r--r-- | desktop/source/migration/migration.cxx | 5 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Setup.xcu | 6 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/makefile.mk | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index dc5127867c..0f78223964 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -391,7 +391,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 @@ -406,7 +406,7 @@ install_info MigrationImpl::findInstallation(const strings_v& rVersions) } catch( uno::Exception& ){} } - i_ver++; + ++i_ver; } return aInfo; @@ -428,6 +428,7 @@ sal_Int32 MigrationImpl::findPreferedMigrationProcess(const migrations_available break; } ++i; + ++rIter; } return nIndex; diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index b417da4eb9..7899948bde 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -761,7 +761,8 @@ <value>100</value> </prop> <prop oor:name="VersionIdentifiers"> - <value oor:separator=",">StarOffice 9=staroffice/9,StarSuite 9=starsuite/9</value> + <value oor:separator="," install:module="all">StarOffice 9=staroffice/9,StarSuite 9=starsuite/9</value> + <value oor:separator="," install:module="macosx">StarOffice 9=StarOffice/9,StarSuite 9=StarSuite/9</value> </prop> <node oor:name="MigrationSteps"> <node oor:name="Common" oor:op="replace"> @@ -811,7 +812,8 @@ <value>90</value> </prop> <prop oor:name="VersionIdentifiers"> - <value oor:separator=",">OpenOffice.org 3=openoffice.org/3</value> + <value oor:separator="," install:module="all">OpenOffice.org 3=openoffice.org/3</value> + <value oor:separator="," install:module="macosx">OpenOffice.org 3=OpenOffice.org/3</value> </prop> <node oor:name="MigrationSteps"> <node oor:name="Common" oor:op="replace"> diff --git a/officecfg/registry/data/org/openoffice/makefile.mk b/officecfg/registry/data/org/openoffice/makefile.mk index 6d5a1b264d..8475f0714d 100644 --- a/officecfg/registry/data/org/openoffice/makefile.mk +++ b/officecfg/registry/data/org/openoffice/makefile.mk @@ -48,6 +48,8 @@ XCUFILES= \ MODULEFILES= \ Inet-defaultsearchengine.xcu \ + Setup-all.xcu \ + Setup-macosx.xcu \ Setup-brand.xcu \ Setup-writer.xcu \ Setup-calc.xcu \ |