Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index



On Tue, 2011-05-31 at 15:08 +0200, Bjoern Michaelsen wrote:
please review this commit for 3.4 and 3.4.0.

        Pushed to -3-4, the -3-4-0 boat sailed a while back. Any chance you can
review and cherry-pick the attached in return from master to -3-4 :-)

        Thanks,

                Michael.

-- 
 michael.meeks@novell.com  <><, Pseudo Engineer, itinerant idiot
From d847e25271e04196fd99c3e112119cc4f85addcb Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Tue, 24 May 2011 15:27:23 +0100
Subject: [PATCH] remove erroneous FIXMEs when re-starting oosplash.bin

---
 desktop/unx/source/start.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 242a83b..4937ca8 100755
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -1003,12 +1003,16 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
 
             switch (child_get_exit_code (info)) {
             case 79: // re-start with just -env: parameters
-                fprintf (stderr, "FIXME: re-start with just -env: params !\n");
+#if OSL_DEBUG_LEVEL > 0
+                fprintf (stderr, "oosplash: re-start with just -env: params !\n");
+#endif
                 bRestart = sal_True;
                 bAllArgs = sal_False;
                 break;
             case 81: // re-start with all arguments
-                fprintf (stderr, "FIXME: re-start with all params !\n");
+#if OSL_DEBUG_LEVEL > 0
+                fprintf (stderr, "oosplash: re-start with all params !\n");
+#endif
                 bRestart = sal_True;
                 bAllArgs = sal_True;
                 break;
-- 
1.7.3.4


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.