ooo-build r13494 - in trunk: . patches/dev300

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Thu Aug  7 15:06:38 2008
New Revision: 13494
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13494&view=rev

Log:
2008-08-07  Jan Holesovsky  <kendy suse cz>

        * patches/dev300/desktop-config-migration.diff,
          patches/dev300/scp2-user-config-ooo-2.0.diff: Update for ooo300-m1.

        * configure.in,
          download.in: Make ooo300-m1 the default.


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/download.in
   trunk/patches/dev300/desktop-config-migration.diff
   trunk/patches/dev300/scp2-user-config-ooo-2.0.diff

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Aug  7 15:06:38 2008
@@ -477,6 +477,7 @@
 AC_MSG_CHECKING([for split sources])
 SPLIT=$with_split
 test -z "$SPLIT" && echo $CVSTAG | grep -q "dev300" && test `echo $CVSTAG | sed 's|dev300-m||'` -gt 21 && SPLIT=yes
+test -z "$SPLIT" && echo $CVSTAG | grep -q "ooo300" && SPLIT=yes
 AC_MSG_RESULT([${SPLIT:-no}])
 AC_SUBST(SPLIT)
 

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Thu Aug  7 15:06:38 2008
@@ -35,6 +35,7 @@
     'oof680-m.*'			 => '@MIRROR@/OOF680',
     'oog680-m.*'			 => '@MIRROR@/OOG680',
     'ooh680-m.*'			 => '@MIRROR@/OOH680',
+    'ooo300-m.*'			 => '@MIRROR@/OOO300',
     'ooo680-m.*'			 => '@MIRROR@/OOO680',
     'OOO_2_0_2.*'			 => '@MIRROR@/OOB680',
     'OOO_2_0_3.*'                        => '@MIRROR@/OOC680',

Modified: trunk/patches/dev300/desktop-config-migration.diff
==============================================================================
--- trunk/patches/dev300/desktop-config-migration.diff	(original)
+++ trunk/patches/dev300/desktop-config-migration.diff	Thu Aug  7 15:06:38 2008
@@ -147,13 +147,13 @@
 +
 +    try
 +    {
-+        Reference< XPropertySet > aPropSet(getConfigAccess("org.openoffice.Setup/Product"), UNO_QUERY_THROW);
-+        Any any = aPropSet->getPropertyValue(ascii("ooSetupVersionAboutBox"));
++        uno::Reference< XPropertySet > aPropSet(getConfigAccess("org.openoffice.Setup/Product"), uno::UNO_QUERY_THROW);
++        uno::Any any = aPropSet->getPropertyValue(ascii("ooSetupVersionAboutBox"));
 +        if (!(any >>= m_aAppVerStr))
 +            // Current version unknown.  Don't do migration (this should not happen).
 +            return sal_False;
 +
-+        aPropSet.set(getConfigAccess("org.openoffice.Setup/Configuration"), UNO_QUERY_THROW);    
++        aPropSet.set(getConfigAccess("org.openoffice.Setup/Configuration"), uno::UNO_QUERY_THROW);    
 +        any = aPropSet->getPropertyValue(ascii("ooLastVersionTouched"));
 +        OUString aLastVersion;
 +        if (!(any >>= aLastVersion))
@@ -174,7 +174,7 @@
 +    return sal_True;
  }
  
- MigrationImpl::MigrationImpl(const Reference< XMultiServiceFactory >& xFactory)
+ MigrationImpl::MigrationImpl(const uno::Reference< XMultiServiceFactory >& xFactory)
 @@ -148,6 +285,7 @@ MigrationImpl::MigrationImpl(const Reference< XMultiServiceFactory >& xFactory)
      , m_aInfo(findInstallation())    
      , m_vrFileList(compileFileList())
@@ -218,13 +218,14 @@
  
  	// prevent running the migration multiple times
  	setMigrationCompleted();
-     return result;
+-    return result;
++    return sal_True;
  }
  
 -void MigrationImpl::refresh()
 +void MigrationImpl::transKeyConfig()
  {
--	uno::Reference< XRefreshable > xRefresh(m_xFactory->createInstance(
+-    uno::Reference< XRefreshable > xRefresh(m_xFactory->createInstance(
 -                OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), uno::UNO_QUERY);
 -    if (xRefresh.is())
 -        xRefresh->refresh();
@@ -246,19 +247,19 @@
 +    {
 +        // For config versions older than 2.4.0 only.
 +
-+        Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier(
++        uno::Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier(
 +            m_xFactory->createInstance(
-+                ascii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier")), UNO_QUERY_THROW);
++                ascii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier")), uno::UNO_QUERY_THROW);
 +    
 +        // Grab the Calc configuration.
-+        Reference< XUIConfigurationManager > xConfigMgr = 
++        uno::Reference< XUIConfigurationManager > xConfigMgr = 
 +            xModuleCfgSupplier->getUIConfigurationManager(
 +                ascii("com.sun.star.sheet.SpreadsheetDocument"));
 +    
 +        if (xConfigMgr.is())
 +        {
-+            Reference< XAcceleratorConfiguration > xScAccel(
-+                xConfigMgr->getShortCutManager(), UNO_QUERY_THROW);
++            uno::Reference< XAcceleratorConfiguration > xScAccel(
++                xConfigMgr->getShortCutManager(), uno::UNO_QUERY_THROW);
 +        
 +            // Backsapce key
 +            awt::KeyEvent aBackEv;
@@ -290,10 +291,10 @@
 +    // Overwrite the character set value for CSV import to -1 (unset) on every 
 +    // upgrade, to prevent it from being incorrectly set to Unicode. (n#376473)
 +
-+    Reference< XPropertySet > aPropSet;
-+    aPropSet.set(getConfigAccess("org.openoffice.Office.Calc/Dialogs/CSVImport", true), UNO_QUERY_THROW);
-+    aPropSet->setPropertyValue(ascii("CharSet"), makeAny(static_cast<sal_Int32>(-1)));
-+    Reference< XChangesBatch >(aPropSet, UNO_QUERY_THROW)->commitChanges();
++    uno::Reference< XPropertySet > aPropSet;
++    aPropSet.set(getConfigAccess("org.openoffice.Office.Calc/Dialogs/CSVImport", true), uno::UNO_QUERY_THROW);
++    aPropSet->setPropertyValue(ascii("CharSet"), uno::makeAny(static_cast<sal_Int32>(-1)));
++    uno::Reference< XChangesBatch >(aPropSet, uno::UNO_QUERY_THROW)->commitChanges();
  }
  
 -sal_Bool MigrationImpl::checkMigrationCompleted()
@@ -301,8 +302,8 @@
  {
 -    sal_Bool bMigrationCompleted = sal_False;
 -    try {
--		uno::Reference< XPropertySet > aPropertySet(
--            getConfigAccess("org.openoffice.Setup/Office"), uno::UNO_QUERY_THROW);
+-        uno::Reference< XPropertySet > aPropertySet(
+-            getConfigAccess("org.openoffice.Setup/Office"), uno::UNO_QUERY_THROW);    
 -        aPropertySet->getPropertyValue(
 -            OUString::createFromAscii("MigrationCompleted")) >>= bMigrationCompleted;
 -    } catch (Exception&) {
@@ -310,21 +311,21 @@
 -    }
 -    return bMigrationCompleted;
 -}
-+	try
++    try
 +    {
-+        Reference< XPropertySet > aPropSet;
++        uno::Reference< XPropertySet > aPropSet;
 +        if (m_aAppVerStr.getLength() > 0)
 +        {
-+            aPropSet.set(getConfigAccess("org.openoffice.Setup/Configuration", true), UNO_QUERY_THROW);
-+            aPropSet->setPropertyValue(ascii("ooLastVersionTouched"), makeAny(m_aAppVerStr));
-+            Reference< XChangesBatch >(aPropSet, UNO_QUERY_THROW)->commitChanges();
++            aPropSet.set(getConfigAccess("org.openoffice.Setup/Configuration", true), uno::UNO_QUERY_THROW);
++            aPropSet->setPropertyValue(ascii("ooLastVersionTouched"), uno::makeAny(m_aAppVerStr));
++            uno::Reference< XChangesBatch >(aPropSet, uno::UNO_QUERY_THROW)->commitChanges();
 +        }
  
 +        m_bMigrationCompleted = true;
-+	} 
++    } 
 +    catch (const Exception&)
 +    {
-+	}
++    }
 +}
  
  migrations_vr MigrationImpl::readMigrationSteps()
@@ -446,7 +447,7 @@
 -            }
 -            i_file++;
 -        }
--    } 
+-    }
 -    else
 -    {
 -        OSL_ENSURE(sal_False, "copyFiles: UserInstall does not exist");

Modified: trunk/patches/dev300/scp2-user-config-ooo-2.0.diff
==============================================================================
--- trunk/patches/dev300/scp2-user-config-ooo-2.0.diff	(original)
+++ trunk/patches/dev300/scp2-user-config-ooo-2.0.diff	Thu Aug  7 15:06:38 2008
@@ -1,10 +1,10 @@
 --- scp2/source/ooo/common_brand.scp	2006-10-11 11:29:58.000000000 +0200
 +++ scp2/source/ooo/common_brand.scp	2007-01-11 12:26:01.000000000 +0100
 @@ -796,7 +796,7 @@
+   #elif defined MACOSX
      Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
-   #endif
    #else
--    Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME%USERDIRPRODUCTVERSION";
+-    Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
 +    Value = "$SYSUSERCONFIG/.ooo-2.0";
    #endif
      StandaloneValue = "$ORIGIN/..";