[Libreoffice] -conver-to on master

[Miklos Vajna]

On Sun, Apr 17, 2011 at 08:51:31AM +0530, Muthu Subramanian K <sumuthu at novell.com> wrote:
> hmm...no idea on this one...I haven't touched the code in a long time now...
> you would want to diff the desktop module and see?

As Andreas points out, it seems the problem is that in 3.3 -conver-to
implied -headless, in 3.4 it does not.

The attached patch fixes the issue for me. Does it look sane?

Thanks.
-------------- next part --------------
From 73290beeff9e0cd4e67065aec6ba869fac2e7605 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos at frugalware.org>
Date: Sun, 17 Apr 2011 22:01:19 +0200
Subject: [PATCH] Make -conver-to imply -headless

---
 desktop/source/app/cmdlineargs.cxx |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 817a43f..b340d59 100755
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -290,6 +290,8 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
                         bOpenEvent = false;
                         bConversionEvent = true;
                         bConversionParamsEvent = true;
+                        SetBoolParam_Impl( CMD_BOOLPARAM_HEADLESS, sal_True );
+                        SetBoolParam_Impl( CMD_BOOLPARAM_INVISIBLE, sal_True );
                     }
                     else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("print-to-file")))
                     {
-- 
1.7.4.4

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20110417/c03cc124/attachment.pgp>