fwk139: Rebase to DEV300m77

1 files changed, 26 insertions, 12 deletions

diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index 95b0c3535a80..b40de510261d 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -65,11 +65,21 @@ struct migration_step
     strings_v includeConfig;
     strings_v excludeConfig;
     strings_v configComponents;
+    strings_v includeExtensions;
+    strings_v excludeExtensions;
     rtl::OUString service;
 };
 
+struct supported_migration
+{
+    rtl::OUString name;
+    sal_Int32     nPriority;
+    strings_v     supported_versions;
+};
+
 typedef std::vector< migration_step > migrations_v;
 typedef std::auto_ptr< migrations_v > migrations_vr;
+typedef std::vector< supported_migration > migrations_available;
 
 class MigrationImpl
 {
@@ -77,18 +87,22 @@ class MigrationImpl
 private:
     strings_vr m_vrVersions;
     NS_UNO::Reference< NS_CSS::lang::XMultiServiceFactory > m_xFactory;
-    migrations_vr m_vrMigrations; // list of all migration specs from config
-    install_info m_aInfo;       // info about the version being migrated
-    strings_vr m_vrFileList;      // final list of files to be copied
-    strings_vr m_vrConfigList;    // final list of nodes to be copied
-    strings_vr m_vrServiceList;   // final list of services to be called
-
-    // initializer functions...
-    migrations_vr readMigrationSteps();
-    install_info findInstallation();
-    strings_vr compileFileList();
-    strings_vr compileConfigList();
-    strings_vr compileServiceList();
+
+    migrations_available m_vMigrationsAvailable; // list of all available migrations
+    migrations_vr        m_vrMigrations;         // list of all migration specs from config
+    install_info         m_aInfo;                // info about the version being migrated
+    strings_vr           m_vrFileList;           // final list of files to be copied
+    strings_vr           m_vrConfigList;         // final list of nodes to be copied
+    strings_vr           m_vrServiceList;        // final list of services to be called
+
+    // functions to control the migration process
+    bool          readAvailableMigrations(migrations_available&);
+    migrations_vr readMigrationSteps(const ::rtl::OUString& rMigrationName);
+    sal_Int32     findPreferedMigrationProcess(const migrations_available&);
+    install_info  findInstallation(const strings_v& rVersions);
+    strings_vr    compileFileList();
+    strings_vr    compileConfigList();
+    strings_vr    compileServiceList();
 
     // helpers
     void substract(strings_v& va, const strings_v& vb_c) const;