Resolves: rhbz#788045 swriter --help wouldn't display help

(cherry picked from commit 24b3f07fe7)

0001-Resolves-rhbz-788045-swriter-help-etc-doesn-t-show-h.patch

@@ -0,0 +1,39 @@
+From 3f9f18c53d9876106b274769dec9d0e3916feb8f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Wed, 29 Feb 2012 11:10:31 +0000
+Subject: [PATCH] Resolves: rhbz#788045 swriter --help etc doesn't show help
+
+because the test in soffice to skip oosplash is for only
+one argument, and swriter points to soffice with an additional
+--writer argument, so the test is skipped
+---
+ desktop/scripts/soffice.sh |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
+index 4d14051..2d42613 100755
+--- a/desktop/scripts/soffice.sh
++++ b/desktop/scripts/soffice.sh
+@@ -158,8 +158,8 @@ if [ -n "$VALGRINDCHECK" -a -z "$VALGRIND" ] ; then
+ fi
+ 
+ # do not pass the request for command line help to oosplash
+-if test "$#" -eq 1; then
+-    case "$1" in
++for arg in $@ ; do
++    case "$arg" in
+         -h | --h | --he | --hel | --help)
+             "$sd_prog/soffice.bin" --help
+             exit 0
+@@ -171,7 +171,7 @@ if test "$#" -eq 1; then
+         *)
+             ;;
+     esac
+-fi
++done
+ 
+ # oosplash does the rest: forcing pages in, javaldx etc. are
+ exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash" "$@"
+-- 
+1.7.7.6
+

libreoffice.spec

@@ -129,6 +129,7 @@ Patch15: 0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch
 Patch16: 0001-make-hsqldb-build-with-java-1.7.patch
 Patch17: libreoffice-ensure-non-broken-xml-tree.patch
 Patch18: 0001-preserve-timestamps-for-.py-files.patch
+Patch19: 0001-Resolves-rhbz-788045-swriter-help-etc-doesn-t-show-h.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -970,6 +971,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch16 -p1 -b .make-hsqldb-build-with-java-1.7.patch
 %patch17 -p1 -b .ensure-non-broken-xml-tree.patch
 %patch18 -p1 -b .preserve-timestamps-for-.py-files.patch
+%patch19 -p1 -b .rhbz788045-swriter-help-etc-doesn-t-show-h.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2248,6 +2250,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Wed Feb 29 2012 Caolán McNamara <caolanm@redhat.com> - 3.5.1.1-2
+- Resolves: rhbz#788045 swriter --help doesn't show help
+
 * Sun Feb 26 2012 David Tardon <dtardon@redhat.com> - 3.5.1.1-1
 - 3.5.1 rc1
 - drop 0001-Resolves-fdo-43644-survive-registered-but-unavailabl.patch