[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - desktop/source

[Libreoffice Gerrit user]

 desktop/source/app/cmdlineargs.cxx |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 0bf6e4fdfdb109dcfd75ddd9ced0c04b2ac987a9
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Aug 10 11:50:52 2018 +0300
Commit:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Aug 14 14:05:54 2018 +0200

    tdf#119194: save deprecated argument early
    
    Change-Id: I4b5001e1f71ac536ac0c3bda4b8c1955020ab40d
    Reviewed-on: https://gerrit.libreoffice.org/58815
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    (cherry picked from commit 5ccf82642b19728e1cfe8fa11f654e90712c5757)
    Reviewed-on: https://gerrit.libreoffice.org/58819
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>

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());
             }
         }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits