sfx2/source/view/classificationhelper.cxx | 3 +-- svx/source/dialog/ClassificationDialog.cxx | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
New commits: commit 59b62c9af6961300555e4f2a170fd70c76b83a72 Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk> Date: Mon Nov 27 17:07:33 2017 +0900 TSCP: don't put a non-existing name into doc. props We combined the abbr. name with the name and put that as a value into doc. properties. This is not correct as such a name doesn't exist in the BAPolicy and con't be identified anymore, so removing this. Also use the values that were put into the ClassificationField instead of the extracted text. Change-Id: I3037bc90a7a394d430f7c0cca4d326473eff3147 Reviewed-on: https://gerrit.libreoffice.org/45316 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Tomaž Vajngerl <qui...@gmail.com> (cherry picked from commit ec9b555e8094f4552c068820cab633307fcf520f) Reviewed-on: https://gerrit.libreoffice.org/46720 Tested-by: Tomaž Vajngerl <qui...@gmail.com> diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx index e1381e85cd01..1d7c0e94b4d3 100644 --- a/sfx2/source/view/classificationhelper.cxx +++ b/sfx2/source/view/classificationhelper.cxx @@ -451,8 +451,7 @@ void SfxClassificationHelper::Impl::pushToDocumentProperties() SfxClassificationPolicyType eType = rPair.first; SfxClassificationCategory& rCategory = rPair.second; std::map<OUString, OUString> aLabels = rCategory.m_aLabels; - const OUString abbreviation = (rCategory.m_aName != rCategory.m_aAbbreviatedName ? " (" + rCategory.m_aAbbreviatedName + ")" : OUString()); - aLabels[policyTypeToString(eType) + PROP_BACNAME()] = rCategory.m_aName + abbreviation; + aLabels[policyTypeToString(eType) + PROP_BACNAME()] = rCategory.m_aName; for (const auto& rLabel : aLabels) { try diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx index aa7f2e778be9..fa5be8da164d 100644 --- a/svx/source/dialog/ClassificationDialog.cxx +++ b/svx/source/dialog/ClassificationDialog.cxx @@ -568,7 +568,7 @@ std::vector<ClassificationResult> ClassificationDialog::getResult() if (pClassificationField) { aClassificationResults.push_back({ pClassificationField->meType, pClassificationField->msFullClassName, - sDisplayString, pClassificationField->msIdentifier }); + pClassificationField->msDescription, pClassificationField->msIdentifier }); } else {
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits