[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - connectivity/source

[Julien Nabet (via logerrit)]

 connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit b89ccad446a28cf1a2396836199a6f8a4f77903b
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Fri Nov 29 17:45:01 2019 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Wed Dec 18 11:05:19 2019 +0100

    Related tdf#128974: Really deal with "default" and "default-release" profiles
    
    See https://support.mozilla.org/gl/questions/1264072 for some background info.
    
    Change-Id: I4939a0c9a8ad09753de4a152f464c647ec637f31
    Reviewed-on: https://gerrit.libreoffice.org/84077
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit a3822a44100ddba8b5f1e0cdd469a89244eaf498)
    Reviewed-on: https://gerrit.libreoffice.org/84085
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index b34eaafc3e46..6f17ab137177 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -133,6 +133,16 @@ namespace connectivity
 
                 }
 
+                // Depending on TB versions, some generate "default" profile
+                // others "default-release" profile
+                // See https://support.mozilla.org/gl/questions/1264072
+                // for some background info (the link quotes Firefox but it seems
+                // the same for TB).
+                if (profileName == "default-release")
+                {
+                    rProduct.mCurrentProfileName = profileName;
+                    break;
+                }
             }
         }