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


Hello,
this patch should fix fdo#57203 in LibreOffice 3.6.

However, I only tested it on Ubuntu against libreoffice/core.
From f41f5ae0055e23c3c1d01a4fdc473b6d9bb09a6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aurimas=20Fi=C5=A1eras?= <aurimas@members.fsf.org>
Date: Sun, 16 Dec 2012 13:41:31 +0200
Subject: fdo#57203 Unknown option: -Embedding

Ignore this option on Windows. It is appended when LibreOffice is called by COM+

Change-Id: I32cbfa276a6699eda99b87580cf9ef23366c40bc
---
 desktop/source/app/cmdlineargs.cxx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 2320a18..d6b9dc7 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -502,6 +502,15 @@ bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& 
aArg
         return true;
     }
 #endif
+#ifdef WIN32
+    /* fdo#57203 ignore -Embedding on Windows
+       when LibreOffice is launched by COM+
+     */
+    else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Embedding" )) )
+    {
+        return true;
+    }
+#endif
     else if ( oArg.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("infilter=")))
     {
         m_infilter.push_back(oArg.copy(RTL_CONSTASCII_LENGTH("infilter=")));
-- 
1.8.0


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.