[PATCH] fdo#57203 Unknown option: -Embedding

Aurimas Fišeras (via_Code_Review) gerrit at gerrit.libreoffice.org
Sun Dec 30 07:53:21 PST 2012


I have submitted a patch for review:


To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/14/1514/1

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
M desktop/source/app/cmdlineargs.cxx
1 file changed, 9 insertions(+), 0 deletions(-)

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 @@
         return true;
+#ifdef WIN32
+    /* fdo#57203 ignore -Embedding on Windows
+       when LibreOffice is launched by COM+
+     */
+    else if ( oArg == "Embedding" )
+    {
+        return true;
+    }
     else if ( oArg.matchIgnoreAsciiCase("infilter="))

To view, visit https://gerrit.libreoffice.org/1514
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a727895c9ec8fa4b06aea8ad66b2791ada66dd5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Aurimas Fišeras <aurimas at members.fsf.org>

More information about the LibreOffice mailing list