From 80984766863c12009415e28b7d7e8a9fe9255546 Mon Sep 17 00:00:00 2001 From: Aurimas FiĊĦeras Date: Sun, 16 Dec 2012 13:41:31 +0200 Subject: 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 Tested-by: Michael Stahl (cherry picked from commit 3616640054f4fc18c6e7307ba17e7d89a0f5ae69) Conflicts: desktop/source/app/cmdlineargs.cxx (cherry picked from commit abf0ed8400d7787fec906b21de74698936d40e28) Signed-off-by: Michael Stahl --- desktop/source/app/cmdlineargs.cxx | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'desktop') diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 51bdad0ba857..28f805436718 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -519,6 +519,15 @@ bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& aArg m_psn = true; 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.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("infilter="))) { -- cgit