[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - cui/source

[Libreoffice Gerrit user]

 cui/source/options/personalization.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 90b979e3977053f96f16ae4b87584536f5099280
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Wed Jan 30 16:42:43 2019 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Fri Feb 1 07:18:56 2019 +0100

    tdf#123050: catch object does not have a key labeled 'theme_data'
    
    json::document_error: node::child: this object does not have a key labeled 'theme_data'
    
    Change-Id: Ic4daf53cff4e3e25b83393cb92957bf60cd5a92c
    Reviewed-on: https://gerrit.libreoffice.org/67161
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 45a0f2177b089065a2099a798639cb534ad67ac3)
    Reviewed-on: https://gerrit.libreoffice.org/67227
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index f199ab2082cb..625362004fe6 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -814,10 +814,10 @@ PersonaInfo parseSingleResponse(const std::string& rResponse)
         return PersonaInfo();
     }
 
-    auto theme_data = aDocumentRoot.child("theme_data");
-
     try
     {
+        auto theme_data = aDocumentRoot.child("theme_data");
+
         PersonaInfo aNewPersona = {
             OUString(),
             OStringToOUString( OString(theme_data.child("name").string_value().get()),