diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-10-29 17:25:10 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-11-01 10:57:43 +0000 |
| commit | ab351f4bf46c698e1b932094a539f0857cc08e1a (patch) | |
| tree | 204511b11e351a70154719042aa7b7e85c6be1bf | |
| parent | 2c40efb012f29df4d02cdc4e7e3e96e3713a75ad (diff) | |
comment disabled extensions import
| -rw-r--r-- | desktop/source/migration/migration.cxx | 1 | ||||
| -rw-r--r-- | desktop/source/migration/services/cexports.cxx | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index dae10d06346c..54799c7ab507 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -869,7 +869,6 @@ void MigrationImpl::copyFiles() { while (i_file != m_vrFileList->end()) { - // remove installation prefix from file localName = i_file->copy(m_aInfo.userdata.getLength()); destName = userInstall + localName; diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx index d393767a68b8..fb102a67bf62 100644 --- a/desktop/source/migration/services/cexports.cxx +++ b/desktop/source/migration/services/cexports.cxx @@ -49,11 +49,14 @@ extern "C" migration::WordbookMigration_getSupportedServiceNames, ::cppu::createSingleComponentFactory, 0, 0 }, -// { -// migration::ExtensionMigration_create, migration::ExtensionMigration_getImplementationName, -// migration::ExtensionMigration_getSupportedServiceNames, ::cppu::createSingleComponentFactory, -// 0, 0 -// }, + // Extension migration was disabled by Oracle / OpenOffice.org +#if 0 + { + migration::ExtensionMigration_create, migration::ExtensionMigration_getImplementationName, + migration::ExtensionMigration_getSupportedServiceNames, ::cppu::createSingleComponentFactory, + 0, 0 + }, +#endif { 0, 0, 0, 0, 0, 0 } }; |