[ooo-build-commit] .: 3 commits - configure.in NEWS patches/dev300

Petr Mladek pmladek at kemper.freedesktop.org
Mon Apr 26 06:54:38 PDT 2010


 NEWS                                              |   67 ++++++++++++++
 configure.in                                      |    2 
 patches/dev300/desktop-config-migration.diff      |   93 ++++++++++----------
 patches/dev300/ooo83878.unopkg.enablelinking.diff |  102 +++++++++-------------
 4 files changed, 161 insertions(+), 103 deletions(-)

New commits:
commit 4a9dcf54674c96b60d7e229f305271530a1b1b40
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Apr 26 15:35:49 2010 +0200

    Fix migration code to work if no older configuration is available (bnc#599590)
    
    * patches/dev300/desktop-config-migration.diff: copy the old config files
      only they exist and the initialization succeed (bnc#599590)

diff --git a/patches/dev300/desktop-config-migration.diff b/patches/dev300/desktop-config-migration.diff
index 1dc66a5..22c1426 100644
--- a/patches/dev300/desktop-config-migration.diff
+++ b/patches/dev300/desktop-config-migration.diff
@@ -10,8 +10,8 @@
  		// keep a language options instance...
  		pLanguageOptions.reset( new SvtLanguageOptions(sal_True));
  
---- desktop/source/migration/migration.cxx.old	2010-04-01 16:31:14.000000000 +0200
-+++ desktop/source/migration/migration.cxx	2010-04-13 15:30:18.000000000 +0200
+--- desktop/source/migration/migration.cxx.old	2010-04-14 17:20:22.000000000 +0200
++++ desktop/source/migration/migration.cxx	2010-04-26 15:00:50.000000000 +0200
 @@ -55,6 +55,10 @@
  #include <com/sun/star/util/XRefreshable.hpp>
  #include <com/sun/star/util/XChangesBatch.hpp>
@@ -131,10 +131,10 @@
 +                                  MigrationImpl::VersionNumber& rAppVerNum)
 +{
 +    if (!splitVersionString(rConfVerStr, rConfVerNum))
-+        return sal_False;
+         return sal_False;
 +
 +    if (!splitVersionString(rAppVerStr, rAppVerNum))
-         return sal_False;
++        return sal_False;
 +
 +#if OSL_DEBUG_LEVEL > 0
 +    fprintf(stdout, "desktop::isMigrationNeeded: config ver = %d.%d.%d\n", 
@@ -215,21 +215,21 @@
 +    {
 +        try
 +        {
-+            initDirectoryMigration();
-+
-+            copyFiles();
++            if (initDirectoryMigration())
++            {
++                copyFiles();
      
 -    sal_Bool result = sal_False;
 -    try{
 -        copyFiles();
 -
--		// execute the migration items from Setup.xcu
--		// and refresh the cache
+-        // execute the migration items from Setup.xcu
+-        // and refresh the cache
 -        copyConfig();
--		refresh();
+-        refresh();
 -
--		// execute custom migration services from Setup.xcu
--		// and refresh the cache
+-        // execute custom migration services from Setup.xcu
+-        // and refresh the cache
 -        runServices();
 -        refresh();
 -
@@ -240,16 +240,16 @@
 -        aMsg += "\nOldVersion: " + OUStringToOString(m_aInfo.productname, RTL_TEXTENCODING_ASCII_US);
 -        aMsg += "\nDataPath  : " + OUStringToOString(m_aInfo.userdata, RTL_TEXTENCODING_ASCII_US);
 -        OSL_ENSURE(sal_False, aMsg.getStr());
-+            // execute the migration items from Setup.xcu
-+            // and refresh the cache
-+            copyConfig();
-+            refresh();
-+    
-+            // execute custom migration services from Setup.xcu
-+            // and refresh the cache
-+            runServices();
-+            refresh();
++                // execute the migration items from Setup.xcu
++                // and refresh the cache
++                copyConfig();
++                refresh();
 +    
++                // execute custom migration services from Setup.xcu
++                // and refresh the cache
++                runServices();
++                refresh();
++            }
 +        }
 +        catch (...)
 +        {
@@ -272,23 +272,22 @@
 +    {
 +        result = sal_False;
 +    }
- 	// prevent running the migration multiple times
- 	setMigrationCompleted();
+     // prevent running the migration multiple times
+     setMigrationCompleted();
      return result;
-@@ -197,31 +351,122 @@ void MigrationImpl::refresh()
+@@ -197,31 +351,126 @@ void MigrationImpl::refresh()
  
  }
  
 -void MigrationImpl::setMigrationCompleted()
 +void MigrationImpl::transKeyConfig()
  {
--	try {
--		uno::Reference< XPropertySet > aPropertySet(getConfigAccess("org.openoffice.Setup/Office", true), uno::UNO_QUERY_THROW);
--		aPropertySet->setPropertyValue(OUString::createFromAscii("MigrationCompleted"), uno::makeAny(sal_True));
--		uno::Reference< XChangesBatch >(aPropertySet, uno::UNO_QUERY_THROW)->commitChanges();
--	} catch (...) {
--		// fail silently
--	}
+-    try {
+-        uno::Reference< XPropertySet > aPropertySet(getConfigAccess("org.openoffice.Setup/Office", true), uno::UNO_QUERY_THROW);
+-        aPropertySet->setPropertyValue(OUString::createFromAscii("MigrationCompleted"), uno::makeAny(sal_True));
+-        uno::Reference< XChangesBatch >(aPropertySet, uno::UNO_QUERY_THROW)->commitChanges();
+-    } catch (...) {
+-        // fail silently
 +    using namespace ::com::sun::star;
 +    using namespace ::com::sun::star::ui;
 +
@@ -332,7 +331,7 @@
 +        
 +            xScAccel->store();
 +        }
-+    }
+     }
  }
  
 -sal_Bool MigrationImpl::checkMigrationCompleted()
@@ -340,7 +339,7 @@
  {
 -    sal_Bool bMigrationCompleted = sal_False;
 -    try {
--		uno::Reference< XPropertySet > aPropertySet(
+-        uno::Reference< XPropertySet > aPropertySet(
 -            getConfigAccess("org.openoffice.Setup/Office"), uno::UNO_QUERY_THROW);
 -        aPropertySet->getPropertyValue(
 -            OUString::createFromAscii("MigrationCompleted")) >>= bMigrationCompleted;
@@ -379,9 +378,10 @@
 +    }
 +    catch (const Exception&)
 +    {
-+    }
-+}
-+
+     }
+-    return bMigrationCompleted;
+ }
+ 
 +void MigrationImpl::setMigrationCompleted()
 +{
 +    try
@@ -398,20 +398,23 @@
 +    } 
 +    catch (const Exception&)
 +    {
-     }
--    return bMigrationCompleted;
- }
- 
-+void MigrationImpl::initDirectoryMigration()
++    }
++}
++
++bool MigrationImpl::initDirectoryMigration()
 +{
 +    m_vrVersions.reset(new strings_v);
 +    readAvailableMigrations(m_vMigrationsAvailable);
 +    sal_Int32 nIndex = findPreferedMigrationProcess(m_vMigrationsAvailable);
 +    if ( nIndex >= 0 )
++    {
 +        m_vrMigrations = readMigrationSteps(m_vMigrationsAvailable[nIndex].name);
-+    // compile file and service list for migration
-+    m_vrFileList = compileFileList();
-+    m_vrServiceList = compileServiceList();
++        // compile file and service list for migration
++        m_vrFileList = compileFileList();
++        m_vrServiceList = compileServiceList();
++        return true;
++    }
++    return false;
 +}
  static void insertSorted(migrations_available& rAvailableMigrations, supported_migration& aSupportedMigration)
  {
@@ -444,7 +447,7 @@
 +    VersionNumber m_aAppVerNum;
 +    VersionNumber m_aConfigVerNum;
 +
-+    void initDirectoryMigration();
++    bool initDirectoryMigration();
  
      // functions to control the migration process
      bool          readAvailableMigrations(migrations_available&);
commit 8184dd6ab526e0780029251d82dbbeb5577ae9db
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Apr 22 16:48:22 2010 +0200

    Release ooo-build-3.2.0.99.3  (3.2.1-beta3)
    
    * version 3.2.0.99.3  (3.2.1-beta3)
    * tag OOO_BUILD_3_2_0_99_3

diff --git a/NEWS b/NEWS
index 377291b..5c015ba 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,73 @@
+ooo-build-3.2.0.99.3 (3.2.1-beta3)
+
+    + features:
+	+ support ooo320-m15 [Rene, Noel, Kendy, Petr, Radek]
+	+ initial support for OOo4Kids [Eric]
+	+ preliminary cppcheck support [Thorsten]
+	+ update Numbertext extension to version 0.8 [Andras]
+	+ add Hungarian cross-reference toolbar extension [Andras]
+	+ update Magyar Linux Libertine fonts to version 20100401 [Andras]
+    + common bits:
+	+ 64-bit nsplugin fix (i#110747) [Rene]
+	+ assertion during HTML import (i#110806) [Thorsten]
+	+ missing image in localized helps (i#99165) [Andras]
+	+ non-existent topic auxiliary/shared.tree (i#110963) [Andras]
+	+ scroll combo box content by default (bnc#591650, i#110227) [Thorsten]
+	+ better support for globally enabled nsplugin (i#49590) [Michael, Rene]
+	+ reset security preferences in unoxml; allows to use the system redland
+	  (i#110523) [Caolan, Rene]
+    + Calc bits:
+	+ data validation XLS import (bnc#594235) [Kohei]
+	+ data pilot deletion crasher (bnc#595617) [Kohei]
+	+ better rendering in Asian vertical mode (bnc#595625) [Kohei]
+	+ merged icon state after shift left click (bnc#595822) [Kohei]
+	+ database functions regression (bnc#594332, bnc#595713) [Kohei]
+	+ conditional formatting XLS import regression (bnc#594266) [Kohei]
+	+ refreshing problem with vertical stack format (bnc#597658) [Kohei]
+	+ deleting rows inside a merged cell (bnc#596414, lp#558968) [Kohei]
+	+ do not export negative decimal places value in ODS (i#110634) [Kohei]
+	+ UI issues in R1C1 formula syntax mode (bnc#595078, bnc#595080) [Kohei]
+    + Impress bits:
+	+ various Calc crashers with gcc-4.5 (bnc#588957, deb#576665) [Thorsten]
+    + Writer bits:
+	+ text input fields crasher [Cédric]
+	+ tabs not displayed in shapes (bnc#564454) [Cédric]
+    	+ more on caption separator with empty caption text (i#110287) [Andras]
+    + VBA bits:
+	+ ErrObj behaviour [Noel]
+	+ wizard truncation problems (bnc#591768) [Noel]
+	+ passing wrong separator for range list (bnc#597351) [Noel]
+	+ Err symbol resolution in VBA/non-VBA mode (bnc#597884) [Noel]
+    + OOXML:
+	+ DOCX font import crasher [Cedric]
+	+ add fly frames DOCS export (bnc#581604) [Cédric]
+	+ regression in paragraph PPTX import (bnc#479829) [Radek]
+    + l10n bits:
+	+ Hungarian translation update [Andras]
+	+ update strings from openSUSE community [Petr]
+	+ do not do extra hacks for en-US-only build [Petr]
+	+ truncated translations in Diagram wizard (i#110702) [Andras]
+	+ footnote anchor Norwegian Bokmål translation (i#109545) [Thorsten]
+	+ Spanish "boolean value" translation fix (deb#576842, i#110674) [Rene]
+    + Build bits:
+	+ parallel build of ct2n extension (bnc#595550) [Petr]
+	+ update prebuilt ooo-cli-prebuilt to version 3.2.1 [Petr]
+	+ npwrap.cxx build without GTK (i#110833, gentoo#306181) [Vadim, Petr]
+    + FSFhu bits:
+	+ do not use NovellOnly stuff [Andras]]
+	+ enable CaptionOrderNumberingFirst for Hungarian (i#110273) [Andras]
+    + Novell bits:
+	+ use --enable-hids (bnc#102592)
+    + Ubuntu bits:
+	+ switch to fulscreen mode using F11 [Chris]
+    + pending:
+	+ shared XLS and XLSX import/export [Katarina]
+
 ooo-build-3.2.0.99.2 (3.2.1-beta2)
 
     + features:
 	+ Linux alpha port (i#110145) [Caolan, Rene]
-	+ automatic scrollbars for writer (fate#588554) [Radek]
+	+ automatic scrollbars for writer (fate#309128) [Radek]
 	+ multilingual Lightproof grammar checker extension [KAMI]
 	+ allow to bundle Magyar Linux Libertine font set [Andras]
 	+ update Hungarian Lightproof extension to version 1.2 [KAMI]
diff --git a/configure.in b/configure.in
index 36889f7..51e988c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(ooo-build, 3.2.0.99.2)
+AC_INIT(ooo-build, 3.2.0.99.3)
 AC_PREREQ(2.51)
 AC_CONFIG_SRCDIR(bin/build-ooo)
 AC_PREFIX_DEFAULT(/usr)
commit 74296ee07fee39dfb42830ec75ee893c98faf618
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Apr 22 13:52:05 2010 +0200

    Updated ooo83878.unopkg.enablelinking.diff to the last version from Caolan
    
    * patches/dev300/ooo83878.unopkg.enablelinking.diff: update from
      http://www.openoffice.org/issues/show_bug.cgi?id=83878

diff --git a/patches/dev300/ooo83878.unopkg.enablelinking.diff b/patches/dev300/ooo83878.unopkg.enablelinking.diff
index d618e8c..f9c054c 100644
--- a/patches/dev300/ooo83878.unopkg.enablelinking.diff
+++ b/patches/dev300/ooo83878.unopkg.enablelinking.diff
@@ -89,7 +89,7 @@ retrieving revision 1.26
 diff -u -r1.26 dp_manager.cxx
 --- desktop/source/deployment/manager/dp_manager.cxx	26 Jul 2007 08:54:34 -0000	1.26
 +++ desktop/source/deployment/manager/dp_manager.cxx	22 Nov 2007 14:45:05 -0000
-@@ -64,6 +64,7 @@
+@@ -57,6 +57,7 @@
  #include "com/sun/star/ucb/NameClash.hpp"
  #include "com/sun/star/deployment/VersionException.hpp"
  #include "com/sun/star/deployment/InstallException.hpp"
@@ -97,7 +97,7 @@ diff -u -r1.26 dp_manager.cxx
  #include "com/sun/star/task/XInteractionApprove.hpp"
  #include "com/sun/star/ucb/UnsupportedCommandException.hpp"
  #include "boost/bind.hpp"
-@@ -512,6 +513,40 @@
+@@ -514,6 +515,40 @@
      return mediaType;
  }
  
@@ -138,7 +138,7 @@ diff -u -r1.26 dp_manager.cxx
  //______________________________________________________________________________
  OUString PackageManagerImpl::insertToActivationLayer(
      OUString const & mediaType, ::ucbhelper::Content const & sourceContent_,
-@@ -536,11 +571,11 @@
+@@ -538,11 +573,11 @@
          destFolder = makeURL( m_activePackages, tempEntry );
      }
      destFolder += OUSTR("_");
@@ -152,14 +152,14 @@ diff -u -r1.26 dp_manager.cxx
      // copy content into activation temp dir:
      if (mediaType.matchIgnoreAsciiCaseAsciiL(
              RTL_CONSTASCII_STRINGPARAM(
-@@ -552,13 +587,37 @@
-             buf.append(sourceContent.getURL());
-         }
-         buf.append( static_cast<sal_Unicode>('/') );
--        sourceContent = ::ucbhelper::Content( 
--            buf.makeStringAndClear(), xCmdEnv );
-+         sourceContent = ::ucbhelper::Content( buf.makeStringAndClear(), xCmdEnv );
-+    }
+@@ -571,10 +606,33 @@
+         sourceContent = ::ucbhelper::Content( 
+             buf.makeStringAndClear(), xCmdEnv );
+     }
+-    if (! destFolderContent.transferContent(
+-            sourceContent, ::ucbhelper::InsertOperation_COPY,
+-            title, NameClash::OVERWRITE ))
+-        throw RuntimeException( OUSTR("UCB transferContent() failed!"), 0 );
 +
 +    bool bLink = false;
 +    Any request( (deployment::LinkException()) );
@@ -185,14 +185,8 @@ diff -u -r1.26 dp_manager.cxx
 +        if (! destFolderContent.transferContent(
 +                sourceContent, ::ucbhelper::InsertOperation_COPY,
 +                title, NameClash::OVERWRITE ))
-+        {
 +            throw RuntimeException( OUSTR("UCB transferContent() failed!"), 0 );
-+        }
-     }
--    if (! destFolderContent.transferContent(
--            sourceContent, ::ucbhelper::InsertOperation_COPY,
--            title, NameClash::OVERWRITE ))
--        throw RuntimeException( OUSTR("UCB transferContent() failed!"), 0 );
++    }
      
      // write to DB:
      dbData->temporaryName = tempEntry;
@@ -202,18 +196,18 @@ RCS file: /cvs/framework/desktop/source/pkgchk/unopkg/unopkg_app.cxx,v
 retrieving revision 1.6.84.1
 diff -u -r1.6.84.1 unopkg_app.cxx
 --- desktop/source/pkgchk/unopkg/unopkg_app.cxx	10 Aug 2007 15:03:53 -0000	1.6.84.1
-+++ desktop/source/pkgchk/unopkg/unopkg_app.cxx	10 Aug 2007 15:03:53 -0000	1.6.84.1
-@@ -86,6 +86,9 @@
++++ openoffice.org:desktop/source/pkgchk/unopkg/unopkg_app.cxx	10 Aug 2007 15:03:53 -0000	1.6.84.1
+@@ -82,6 +82,9 @@
+ " -V, --version           version information\n"
+ " -v, --verbose           verbose output to stdout\n"
  " -f, --force             force overwriting existing extensions\n"
- " -s, --suppress-license  prevents showing the license provided that\n"
- "                         the extension allows it\n"
 +#ifdef UNX
 +" -l, --link              attempt to link to instead of copying extensions\n"
 +#endif
+ " -s, --suppress-license  prevents showing the license provided that\n"
+ "                         the extension allows it\n"
  " --log-file <file>       custom log file; default: <cache-dir>/log.txt\n"
- " --shared                expert feature: operate on shared installation\n"
- "                                         deployment context;\n"
-@@ -103,6 +106,9 @@
+@@ -101,6 +104,9 @@
      { RTL_CONSTASCII_STRINGPARAM("version"), 'V', false },
      { RTL_CONSTASCII_STRINGPARAM("verbose"), 'v', false },
      { RTL_CONSTASCII_STRINGPARAM("force"), 'f', false },
@@ -223,7 +217,7 @@ diff -u -r1.6.84.1 unopkg_app.cxx
      { RTL_CONSTASCII_STRINGPARAM("log-file"), '\0', true },
      { RTL_CONSTASCII_STRINGPARAM("shared"), '\0', false },
      { RTL_CONSTASCII_STRINGPARAM("deployment-context"), '\0', true },
-@@ -210,6 +216,7 @@
+@@ -208,6 +214,7 @@
      OUString subCommand;
      bool option_shared = false;
      bool option_force = false;
@@ -231,7 +225,7 @@ diff -u -r1.6.84.1 unopkg_app.cxx
      bool option_verbose = false;
      bool option_bundled = false;
      bool option_suppressLicense = false;
-@@ -218,11 +225,13 @@
+@@ -217,11 +224,13 @@
      OUString deploymentContext;
      OUString cmdArg;
      ::std::vector<OUString> cmdPackages;
@@ -246,26 +240,24 @@ diff -u -r1.6.84.1 unopkg_app.cxx
      OptionInfo const * info_verbose = getOptionInfo(
          s_option_infos, OUSTR("verbose") );
      OptionInfo const * info_log = getOptionInfo(
-@@ -276,6 +285,7 @@
+@@ -278,6 +287,7 @@
+                      !readOption( &option_shared, info_shared, &nPos ) &&
                       !readOption( &option_force, info_force, &nPos ) &&
                       !readOption( &option_bundled, info_bundled, &nPos ) &&
-                      !readOption( &option_suppressLicense, info_suppressLicense, &nPos ) &&
 +                     !readOption( &option_link, info_link, &nPos ) &&
+                      !readOption( &option_suppressLicense, info_suppressLicense, &nPos ) &&
                       !readArgument( &deploymentContext, info_context, &nPos ) &&
                       !isBootstrapVariable(&nPos))
-             {
-@@ -350,8 +360,8 @@ extern "C" int unopkg_main()
+@@ -350,7 +360,7 @@
          
          Reference< ::com::sun::star::ucb::XCommandEnvironment > xCmdEnv(
              createCmdEnv( xComponentContext, logFile,
 -                          option_force, option_verbose, option_bundled, 
--                          option_suppressLicense) );
-+                          option_force, option_link, option_verbose,
-+                          option_bundled, option_suppressLicense) );
++                          option_force, option_link, option_verbose, option_bundled, 
+                           option_suppressLicense) );
          
          if (subcmd_add ||
-             subCommand.equalsAsciiL(
-+++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_app.cxx	22 Nov 2007 14:46:24 -0000
++++ desktop/source/pkgchk/unopkg/unopkg_app.cxx	22 Nov 2007 14:46:24 -0000
 Index: source/pkgchk/unopkg/unopkg_cmdenv.cxx
 ===================================================================
 RCS file: /cvs/framework/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx,v
@@ -273,7 +265,7 @@ retrieving revision 1.8
 diff -u -r1.8 unopkg_cmdenv.cxx
 --- desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx	26 Jun 2007 11:13:26 -0000	1.8
 +++ desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx	22 Nov 2007 14:46:24 -0000
-@@ -46,6 +46,7 @@
+@@ -43,6 +43,7 @@
  #include "com/sun/star/task/XInteractionAbort.hpp"
  #include "com/sun/star/task/XInteractionApprove.hpp"
  #include "com/sun/star/deployment/InstallException.hpp"
@@ -281,7 +273,7 @@ diff -u -r1.8 unopkg_cmdenv.cxx
  #include "com/sun/star/container/ElementExistException.hpp"
  #include "com/sun/star/deployment/LicenseException.hpp"
  #include "com/sun/star/deployment/VersionException.hpp"
-@@ -98,6 +99,7 @@
+@@ -84,6 +85,7 @@
  {
      sal_Int32 m_logLevel;
      bool m_option_force_overwrite;
@@ -289,7 +281,7 @@ diff -u -r1.8 unopkg_cmdenv.cxx
      bool m_option_verbose;
      bool m_option_bundled;
      bool m_option_suppressLicense;
-@@ -112,6 +114,7 @@
+@@ -99,6 +101,7 @@
          Reference<XComponentContext> const & xComponentContext,
          OUString const & log_file,
          bool option_force_overwrite,
@@ -297,7 +289,7 @@ diff -u -r1.8 unopkg_cmdenv.cxx
          bool option_verbose,
          bool option_bundled,
          bool option_suppressLicense);
-@@ -137,11 +140,13 @@
+@@ -125,11 +128,13 @@
      Reference<XComponentContext> const & xComponentContext,
      OUString const & log_file,
      bool option_force_overwrite,
@@ -311,7 +303,7 @@ diff -u -r1.8 unopkg_cmdenv.cxx
        m_option_verbose( option_verbose ),
        m_option_bundled( option_bundled),
        m_option_suppressLicense( option_suppressLicense),
-@@ -270,6 +275,7 @@
+@@ -246,6 +251,7 @@
      lang::WrappedTargetException wtExc;
  	deployment::LicenseException licExc;
      deployment::InstallException instExc;
@@ -319,18 +311,18 @@ diff -u -r1.8 unopkg_cmdenv.cxx
      deployment::LicenseIndividualAgreementException licAgreementExc;
      deployment::PlatformException platExc;
      deployment::VersionException verExc;
-@@ -303,6 +309,10 @@ void CommandEnvironmentImpl::handle(
+@@ -303,6 +309,10 @@
          else
              printLicense(licExc.Text, approve, abort);
-     }
-+        else if (request >>= linkExc)
-+	{
-+            approve = m_option_link;
-+	}
-        else if (request >>= instExc)
-     {
-         //Only if the unopgk was started with gui + extension then we user is asked.
-@@ -445,13 +455,14 @@ Reference< XCommandEnvironment > createC
+ 	}
++    else if (request >>= linkExc)
++    {
++        approve = m_option_link;
++    }
+    	else if (request >>= instExc)
+ 	{
+ 		//Only if the unopgk was started with gui + extension then we user is asked.
+@@ -445,12 +455,13 @@
      Reference< XComponentContext > const & xContext,
      OUString const & logFile,
      bool option_force_overwrite,
@@ -341,12 +333,10 @@ diff -u -r1.8 unopkg_cmdenv.cxx
  {
      return new CommandEnvironmentImpl(
 -        xContext, logFile, option_force_overwrite, option_verbose, option_bundled,
--        option_suppressLicense);
-+        xContext, logFile, option_force_overwrite, option_link, option_verbose,
-+        option_bundled, option_suppressLicense);
++        xContext, logFile, option_force_overwrite, option_link, option_verbose, option_bundled,
+         option_suppressLicense);
  }
  
- } // unopkg
 Index: source/pkgchk/unopkg/unopkg_shared.h
 ===================================================================
 RCS file: /cvs/framework/desktop/source/pkgchk/unopkg/unopkg_shared.h,v
@@ -354,7 +344,7 @@ retrieving revision 1.2.130.1
 diff -u -r1.2.130.1 unopkg_shared.h
 --- desktop/source/pkgchk/unopkg/unopkg_shared.h	10 Aug 2007 15:04:16 -0000	1.2.130.1
 +++ desktop/source/pkgchk/unopkg/unopkg_shared.h	22 Nov 2007 14:46:24 -0000
-@@ -131,6 +131,7 @@
+@@ -162,6 +162,7 @@
      css::uno::Reference<css::uno::XComponentContext> const & xContext,
      ::rtl::OUString const & logFile,
      bool option_force_overwrite,


More information about the ooo-build-commit mailing list