diff options
| author | Aurimas FiĊĦeras <aurimas@members.fsf.org> | 2012-12-16 13:41:31 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-07 16:51:11 +0100 |
| commit | abf0ed8400d7787fec906b21de74698936d40e28 (patch) | |
| tree | 4aad78e34554872b02f029b2c99ae313d414528a | |
| parent | a59e6dc3688c75184ea89b690333b1fd28408fae (diff) | |
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@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 3616640054f4fc18c6e7307ba17e7d89a0f5ae69)
Conflicts:
desktop/source/app/cmdlineargs.cxx
| -rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 2320a18b953b..f5016e323acf 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 == "Embedding" ) + { + return true; + } +#endif else if ( oArg.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("infilter="))) { m_infilter.push_back(oArg.copy(RTL_CONSTASCII_LENGTH("infilter="))); |