ooo-build r11533 - in trunk: . patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri Feb  8 05:13:37 2008
New Revision: 11533
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11533&view=rev

Log:
2008-02-07  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/desktop-cmdhelp-stdout.diff: display the command line
	help to stdout instead of stderr.

	* patches/src680/apply: apply the patch.


Added:
   trunk/patches/src680/desktop-cmdhelp-stdout.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Fri Feb  8 05:13:37 2008
@@ -787,6 +787,9 @@
 # html in ISO-8859-2 encoding.
 svtools-html-iso-8859-2-ignore-chars.diff, i#15456, kohei
 
+# display command line help '-h' to stdout instead of stderr.
+desktop-cmdhelp-stdout.diff, kohei
+
 [ Misc < ooh680-m5 ]
 # Don't substitute downloadable fonts with resident fonts.
 psprint-do-not-substitute.diff, i#84481, kohei

Added: trunk/patches/src680/desktop-cmdhelp-stdout.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/desktop-cmdhelp-stdout.diff	Fri Feb  8 05:13:37 2008
@@ -0,0 +1,28 @@
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=desktop.vpj desktop.clean/source/app/cmdlinehelp.cxx desktop/source/app/cmdlinehelp.cxx
+--- desktop.clean/source/app/cmdlinehelp.cxx	2008-02-07 22:11:46.000000000 -0500
++++ desktop/source/app/cmdlinehelp.cxx	2008-02-07 22:23:07.000000000 -0500
+@@ -143,18 +143,19 @@ namespace desktop
+ 		aHelpMessage_head.SearchAndReplaceAscii( "%CMDNAME", String( "soffice", RTL_TEXTENCODING_ASCII_US) );
+ #ifdef UNX
+ 		// on unix use console for output
+-		fprintf(stderr, "%s\n", ByteString(aHelpMessage_head,
+-					RTL_TEXTENCODING_ASCII_US).GetBuffer());
++        FILE* fs = stdout;
++        fprintf(fs, "%s\n", ByteString(aHelpMessage_head,
++                    RTL_TEXTENCODING_ASCII_US).GetBuffer());
+ 		// merge left and right column
+ 		int n = aHelpMessage_left.GetTokenCount ('\n');
+ 		ByteString bsLeft(aHelpMessage_left, RTL_TEXTENCODING_ASCII_US);
+ 		ByteString bsRight(aHelpMessage_right, RTL_TEXTENCODING_ASCII_US);
+ 		for ( int i = 0; i < n; i++ )
+ 		{
+-			fprintf(stderr, "%s", bsLeft.GetToken(i, '\n').GetBuffer());
+-			fprintf(stderr, "%s\n", bsRight.GetToken(i, '\n').GetBuffer());
++            fprintf(fs, "%s", bsLeft.GetToken(i, '\n').GetBuffer());
++            fprintf(fs, "%s\n", bsRight.GetToken(i, '\n').GetBuffer());
+ 		}
+-		fprintf(stderr, "%s", ByteString(aHelpMessage_bottom,
++        fprintf(fs, "%s", ByteString(aHelpMessage_bottom,
+                     RTL_TEXTENCODING_ASCII_US).GetBuffer());
+ #else
+ 		// rest gets a dialog box