[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                                     |    3 +++
 patches/dev300/desktop-quickstart-option-enable-unx.diff |   11 +++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit 7506de87821697eccbe994b65b7751f4c320e8f5
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Feb 3 21:25:22 2010 +0100

    Enable -quistart option on Linux again (i#108918, bnc#575555)
    
    * patches/dev300/desktop-quickstart-option-enable-unx.diff:
    * patches/dev300/apply: the -quickstart option was disabled on Linux
      from some reasons; the enabled quickstarter mode was not detected
      (i#108918, bnc#575555)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 21c18e9..6cf8d6a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -630,6 +630,9 @@ unxsplash-3layer.diff, i#60696, jholesov
 # fix bitmap reading; the lines are aliased to 4 bytes
 unxsplash-bmp-alias.diff, i#60696, jholesov
 
+# enable -quistart option on Linux
+desktop-quickstart-option-enable-unx.diff, i#108918, n#575555, pmladek
+
 [ WriterFixes ]
 # Some WW8 fields weren't imported at all
 sw-ww8-field-fix.diff, i#61075, i#89667, cbosdo
diff --git a/patches/dev300/desktop-quickstart-option-enable-unx.diff b/patches/dev300/desktop-quickstart-option-enable-unx.diff
new file mode 100644
index 0000000..5252084
--- /dev/null
+++ b/patches/dev300/desktop-quickstart-option-enable-unx.diff
@@ -0,0 +1,11 @@
+--- desktop/source/app/cmdlineargs.cxx.old	2010-01-27 22:33:46.000000000 +0100
++++ desktop/source/app/cmdlineargs.cxx	2010-02-03 21:06:51.000000000 +0100
+@@ -396,7 +396,7 @@ sal_Bool CommandLineArgs::InterpretComma
+     }
+     else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-quickstart" )) == sal_True )
+     {
+-#if defined(WNT) || defined(OS2) || defined(QUARTZ)
++#if defined(WNT) || defined(OS2) || defined(QUARTZ) || defined(UNX)
+         SetBoolParam_Impl( CMD_BOOLPARAM_QUICKSTART, sal_True );
+ #endif
+         return sal_True;