[Libreoffice-commits] .: patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                       |    3 --
 patches/dev300/desktop-cmdhelp-stdout.diff |   35 -----------------------------
 2 files changed, 38 deletions(-)

New commits:
commit 2fd534bbd5c9da4c661ccc8fecade461850c2f67
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Jan 19 12:18:32 2011 -0500

    Removed obsolete patch.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9500691..e2ab41c 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -450,9 +450,6 @@ svtools-default-new-document.diff, rodo
 # Grouping items in the templates dialog n#106603
 svtools-unsort-template-dialogentries.diff, rodo
 
-# display command line help '-h' to stdout instead of stderr.
-desktop-cmdhelp-stdout.diff, kohei
-
 # reduce mininum password length from 5 to 1.
 min-password-length-sfx2.diff, i#85453, kohei
 min-password-length-helpcontent2.diff, i#112772, timar
diff --git a/patches/dev300/desktop-cmdhelp-stdout.diff b/patches/dev300/desktop-cmdhelp-stdout.diff
deleted file mode 100644
index dd832f2..0000000
--- a/patches/dev300/desktop-cmdhelp-stdout.diff
+++ /dev/null
@@ -1,35 +0,0 @@
----
- desktop/source/app/cmdlinehelp.cxx |    9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git desktop/source/app/cmdlinehelp.cxx desktop/source/app/cmdlinehelp.cxx
-index 8af72e6..3032315 100644
---- desktop/source/app/cmdlinehelp.cxx
-+++ desktop/source/app/cmdlinehelp.cxx
-@@ -135,7 +135,8 @@ 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,
-+        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');
-@@ -143,10 +144,10 @@ namespace desktop
-         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
--- 
-1.7.0.1
-