diff options
| -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 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; diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index 24efde5417ee..de70808e9307 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -757,7 +757,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"> @@ -807,7 +808,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 b51285af50cc..7de57da341d0 100644 --- a/officecfg/registry/data/org/openoffice/makefile.mk +++ b/officecfg/registry/data/org/openoffice/makefile.mk @@ -48,6 +48,8 @@ MODULEFILES= \ Inet-macosx.xcu \ Inet-unixdesktop.xcu \ Inet-wnt.xcu \ + Setup-all.xcu \ + Setup-macosx.xcu \ Setup-brand.xcu \ Setup-writer.xcu \ Setup-calc.xcu \ |