[Libreoffice-commits] .: desktop/source

[Thorsten Behrens]

 desktop/source/migration/migration.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit bfc3c94720fc85bc1c69e2c9aa127ab7ab36d71c
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Oct 14 13:45:37 2010 +0200

    Disable user migration when SAL_DISABLE_USERMIGRATION is set
    
    Because of the fact that LibreOffice automatically converts old
    user configurations over to the new install (which is right 99% of
    the times), we needed a way to explicitely prevent that on first
    start - simply export SAL_DISABLE_USERMIGRATION=1 on initial LibO
    start.

diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index e1f2dce..7cbe0fe 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -398,6 +398,13 @@ sal_Bool MigrationImpl::checkMigrationCompleted()
             getConfigAccess("org.openoffice.Setup/Office"), uno::UNO_QUERY_THROW);
         aPropertySet->getPropertyValue(
             OUString::createFromAscii("MigrationCompleted")) >>= bMigrationCompleted;
+
+        static const char* pEnv = getenv("SAL_DISABLE_USERMIGRATION" );
+        if( !bMigrationCompleted && pEnv != NULL )
+        {
+            // migration prevented - fake it's success
+            setMigrationCompleted();
+        }
     } catch (Exception&) {
         // just return false...
     }