[Libreoffice-commits] .: desktop/source

[Libreoffice Gerrit user]

 desktop/source/app/cmdlineargs.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 3616640054f4fc18c6e7307ba17e7d89a0f5ae69
Author: Aurimas Fišeras <aurimas at members.fsf.org>
Date:   Sun Dec 16 13:41:31 2012 +0200

    fdo#57203 Unknown option: -Embedding
    
    Ignore this option on Windows.
    This work-arounds a regression introduced by f4a4ba9ac
    Windows appends -Embedding when LibreOffice is called by COM+
    Before f4a4ba9ac this option was silently ignored.
    
    Change-Id: I8a727895c9ec8fa4b06aea8ad66b2791ada66dd5
    Reviewed-on: https://gerrit.libreoffice.org/1514
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 4a8ddcd..be40f87 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -500,6 +500,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 == "Embedding" )
+    {
+        return true;
+    }
+#endif
     else if ( oArg.matchIgnoreAsciiCase("infilter="))
     {
         m_infilter.push_back(oArg.copy(RTL_CONSTASCII_LENGTH("infilter=")));