[Libreoffice-commits] core.git: desktop/unx

[Miklos Vajna]

 desktop/unx/source/args.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 58f48448cfb24bd6baa95a8e09e9739fcd3cb485
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jan 1 13:39:14 2015 +0100

    desktop: adapt pArgDescr to CommandLineArgs::ParseCommandLine_Impl()
    
    Commit fe5527f1c6dc259af464a0593e86a2da2983b7ed (desktop, sysui: let
    --convert-to imply --headless, 2014-12-22) changed
    CommandLineArgs::ParseCommandLine_Impl(), so that --convert-to implies
    --headless. However, that worked only when ./soffice.bin was launched;
    when the ./soffice wrapper started oosplash, then a logo was still
    shown, as oosplash has its own list of switches that disable the splash
    screen.
    
    Fix the inconsistency by adding "convert-to" to oosplash's list as well.
    
    Change-Id: I47e30db3b658f179f10e8a447b5d7cea083fcc60

diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c
index 77fe3d8..f4c75d5 100644
--- a/desktop/unx/source/args.c
+++ b/desktop/unx/source/args.c
@@ -38,6 +38,7 @@ static struct {
     { "invisible",  0, 1, 0, 0, 0, NULL },
     { "quickstart", 0, 1, 0, 0, 0, NULL },
     { "minimized",  0, 1, 0, 0, 0, NULL },
+    { "convert-to",  0, 1, 0, 0, 0, NULL },
 
     /* pagein bits */
     { "writer",     0, 0, 0, 0, 0, "pagein-writer"  },