[Libreoffice-commits] core.git: svx/source

[Tomaž Vajngerl]

 svx/source/dialog/ClassificationDialog.cxx |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 9da4b3ee827e83b816514e4eb071e5322cb5ad01
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Thu Nov 16 18:44:42 2017 +0900

    TSCP: also store the identifier into the recently used XML
    
    Change-Id: I19ccfb8f5118d73535d0e94bf32818d82670d093
    Reviewed-on: https://gerrit.libreoffice.org/44847
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx
index f8cebe090042..f7c3edf068cf 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -154,6 +154,9 @@ void writeResultToXml(tools::XmlWriter & rXmlWriter,
         rXmlWriter.startElement("abbreviatedString");
         rXmlWriter.content(rResult.msAbbreviatedName);
         rXmlWriter.endElement();
+        rXmlWriter.startElement("identifier");
+        rXmlWriter.content(rResult.msIdentifier);
+        rXmlWriter.endElement();
         rXmlWriter.endElement();
     }
 }
@@ -333,6 +336,7 @@ void ClassificationDialog::readRecentlyUsed()
                         svx::ClassificationType eType = svx::ClassificationType::TEXT;
                         OUString sString;
                         OUString sAbbreviatedString;
+                        OUString sIdentifier;
 
                         // Convert string to classification type, but continue only if
                         // conversion was successful.
@@ -350,11 +354,15 @@ void ClassificationDialog::readRecentlyUsed()
                                 {
                                     sAbbreviatedString = OStringToOUString(aWalker.content(), RTL_TEXTENCODING_UTF8);
                                 }
+                                else if (aWalker.name() == "identifier")
+                                {
+                                    sIdentifier = OStringToOUString(aWalker.content(), RTL_TEXTENCODING_UTF8);
+                                }
                                 aWalker.next();
                             }
                             aWalker.parent();
 
-                            aResults.push_back({ eType, sString, sAbbreviatedString, OUString() });
+                            aResults.push_back({ eType, sString, sAbbreviatedString, sIdentifier });
                         }
                     }
                     aWalker.next();