[ooo-build-commit] .: patches/dev300

[Petr Mladek]

 patches/dev300/ooo83878.unopkg.enablelinking.diff |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

New commits:
commit f0466bbd1a3a44a071f356a0d8d82480bf442f8f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Apr 22 12:55:17 2010 +0200

    Fix ooo83878.unopkg.enablelinking.diff to aplly with older patch tool
    
    * patches/dev300/ooo83878.unopkg.enablelinking.diff:

diff --git a/patches/dev300/ooo83878.unopkg.enablelinking.diff b/patches/dev300/ooo83878.unopkg.enablelinking.diff
index 78a1d35..d618e8c 100644
--- a/patches/dev300/ooo83878.unopkg.enablelinking.diff
+++ b/patches/dev300/ooo83878.unopkg.enablelinking.diff
@@ -254,7 +254,8 @@ diff -u -r1.6.84.1 unopkg_app.cxx
                       !readArgument( &deploymentContext, info_context, &nPos ) &&
                       !isBootstrapVariable(&nPos))
              {
-@@ -346,7 +356,7 @@
+@@ -350,8 +360,8 @@ extern "C" int unopkg_main()
+         
          Reference< ::com::sun::star::ucb::XCommandEnvironment > xCmdEnv(
              createCmdEnv( xComponentContext, logFile,
 -                          option_force, option_verbose, option_bundled, 
@@ -318,18 +319,18 @@ diff -u -r1.8 unopkg_cmdenv.cxx
      deployment::LicenseIndividualAgreementException licAgreementExc;
      deployment::PlatformException platExc;
      deployment::VersionException verExc;
-@@ -318,6 +324,10 @@
+@@ -303,6 +309,10 @@ void CommandEnvironmentImpl::handle(
          else
              printLicense(licExc.Text, approve, abort);
- 	}
-+   	else if (request >>= linkExc)
+     }
++        else if (request >>= linkExc)
 +	{
-+		approve = m_option_link;
++            approve = m_option_link;
 +	}
-    	else if (request >>= instExc)
- 	{
- 		//Only if the unopgk was started with gui + extension then we user is asked.
-@@ -457,13 +467,14 @@
+        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
      Reference< XComponentContext > const & xContext,
      OUString const & logFile,
      bool option_force_overwrite,