diff options
| author | Ashod Nakashian <ashodnakashian@yahoo.com> | 2017-10-31 21:42:24 -0400 |
|---|---|---|
| committer | Ashod Nakashian <ashnakash@gmail.com> | 2017-11-03 12:06:39 +0100 |
| commit | 7bd8f9ed9559a745f3ed59161d282b199edd69a7 (patch) | |
| tree | 2aacd1114083d10fbbe8d3717a61943d02ad7da5 /sd | |
| parent | 4bba85e04cda1cb5769114be5ad771de55d56d14 (diff) | |
TSCP: Paragraph signature RDF namespace now urn:bails
And remove PARAGRAPH entries from ClassificationResults
to restore adding the parens correctly.
Change-Id: Id0f07758e4daad8d0736800e211e35e9c7e026cf
Reviewed-on: https://gerrit.libreoffice.org/44145
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 3ccbe562ccf8..d01957dcf10c 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -323,7 +323,7 @@ private: OUString aValue = lcl_getProperty(xPropertyContainer, aKey); m_aResults.push_back({ svx::ClassificationType::TEXT, aValue, sBlank, sBlank }); } - else if (aKeyCreator.isCategoryKey(aKey)) + else if (aKeyCreator.isCategoryNameKey(aKey) || aKeyCreator.isCategoryIdentifierKey(aKey)) { OUString aValue = lcl_getProperty(xPropertyContainer, aKey); m_aResults.push_back({ svx::ClassificationType::CATEGORY, aValue, sBlank, sBlank }); @@ -406,7 +406,7 @@ private: void deleteExistingObjects() { sfx::ClassificationKeyCreator aKeyCreator(SfxClassificationHelper::getPolicyType()); - OUString sKey = aKeyCreator.makeCategoryKey(); + OUString sKey = aKeyCreator.makeCategoryNameKey(); const sal_uInt16 nCount = m_rDrawViewShell.GetDoc()->GetMasterSdPageCount(PageKind::Standard); @@ -498,7 +498,7 @@ public: case svx::ClassificationType::CATEGORY: { - OUString sKey = aKeyCreator.makeCategoryKey(); + OUString sKey = aKeyCreator.makeCategoryNameKey(); pOutliner->QuickInsertField(SvxFieldItem(editeng::CustomPropertyField(sKey, rResult.msName), EE_FEATURE_FIELD), aPosition); } break; |