diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2017-11-27 17:07:33 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2017-12-18 14:12:01 +0100 |
| commit | 59b62c9af6961300555e4f2a170fd70c76b83a72 (patch) | |
| tree | ceeed18202edcad7348e7ed7cae6acf08c514768 /sfx2 | |
| parent | 2b02335dd53975ccea164709e42c0605291e61ea (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit ec9b555e8094f4552c068820cab633307fcf520f)
Reviewed-on: https://gerrit.libreoffice.org/46720
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/classificationhelper.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
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 |