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

Ashod Nakashian ashod.nakashian at collabora.co.uk
Fri Nov 3 14:18:23 UTC 2017


 svx/source/dialog/ClassificationDialog.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 012946122bed55d9a51c4b37a3b72899274e49c9
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Fri Nov 3 09:50:50 2017 -0400

    TSCP: fix build by correcting member names
    
    Change-Id: I77212f1c6ca3d54ced1b73604e9d8a3022d72700

diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx
index 7eed3b94e424..30f6c796240f 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -76,7 +76,7 @@ OUString getStringRepresentation(std::vector<ClassificationResult> const & rResu
             case svx::ClassificationType::INTELLECTUAL_PROPERTY_PART:
             case svx::ClassificationType::MARKING:
             case svx::ClassificationType::TEXT:
-                sRepresentation += rResult.msString;
+                sRepresentation += rResult.msName;
             break;
 
             case svx::ClassificationType::PARAGRAPH:
@@ -109,10 +109,10 @@ void writeResultToXml(tools::XmlWriter & rXmlWriter,
         }
         rXmlWriter.attribute("type", sType);
         rXmlWriter.startElement("string");
-        rXmlWriter.content(rResult.msString);
+        rXmlWriter.content(rResult.msName);
         rXmlWriter.endElement();
         rXmlWriter.startElement("abbreviatedString");
-        rXmlWriter.content(rResult.msAbbreviatedString);
+        rXmlWriter.content(rResult.msAbbreviatedName);
         rXmlWriter.endElement();
         rXmlWriter.endElement();
     }
@@ -311,7 +311,7 @@ void ClassificationDialog::readRecentlyUsed()
                             }
                             aWalker.parent();
 
-                            aResults.push_back({ eType, sString, sAbbreviatedString });
+                            aResults.push_back({ eType, sString, sAbbreviatedString, OUString() });
                         }
                     }
                     aWalker.next();


More information about the Libreoffice-commits mailing list