diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-08-10 11:50:52 +0300 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2018-08-14 14:05:54 +0200 |
| commit | 0bf6e4fdfdb109dcfd75ddd9ced0c04b2ac987a9 (patch) | |
| tree | 87552ac0f6be4646ff63436bb2658cfade216e75 | |
| parent | d7cbaac61b8f3575184c675a760907c3b4bb225e (diff) | |
tdf#119194: save deprecated argument early
Change-Id: I4b5001e1f71ac536ac0c3bda4b8c1955020ab40d
Reviewed-on: https://gerrit.libreoffice.org/58815
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 5ccf82642b19728e1cfe8fa11f654e90712c5757)
Reviewed-on: https://gerrit.libreoffice.org/58819
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index e67f204866e9..490bf183de33 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -287,9 +287,12 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) { m_bEmpty = false; OUString oArg; - bool bDeprecated = !aArg.startsWith("--", &oArg) - && aArg.startsWith("-", &oArg) && aArg.getLength() > 2; - // -h, -?, -n, -o, -p are still valid + OUString oDeprecatedArg; + if (!aArg.startsWith("--", &oArg) && aArg.startsWith("-", &oArg) + && aArg.getLength() > 2) // -h, -?, -n, -o, -p are still valid + { + oDeprecatedArg = aArg; // save here, since aArg can change later + } OUString rest; if ( oArg == "minimized" ) @@ -423,7 +426,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) */ else if ( aArg.startsWith("-psn") ) { - bDeprecated = false; + oDeprecatedArg.clear(); } #endif #if HAVE_FEATURE_MACOSX_SANDBOX @@ -439,7 +442,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) */ else if ( oArg == "Embedding" ) { - bDeprecated = false; + oDeprecatedArg.clear(); } #endif else if ( oArg.startsWith("infilter=", &rest)) @@ -622,7 +625,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) { m_unknown = aArg; } - bDeprecated = false; + oDeprecatedArg.clear(); } else { @@ -673,9 +676,9 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) } } - if (bDeprecated) + if (!oDeprecatedArg.isEmpty()) { - OString sArg(OUStringToOString(aArg, osl_getThreadTextEncoding())); + OString sArg(OUStringToOString(oDeprecatedArg, osl_getThreadTextEncoding())); fprintf(stderr, "Warning: %s is deprecated. Use -%s instead.\n", sArg.getStr(), sArg.getStr()); } } |