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 /include | |
| 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 'include')
| -rw-r--r-- | include/sfx2/classificationhelper.hxx | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/include/sfx2/classificationhelper.hxx b/include/sfx2/classificationhelper.hxx index 11782247ca23..6467976c952b 100644 --- a/include/sfx2/classificationhelper.hxx +++ b/include/sfx2/classificationhelper.hxx @@ -113,16 +113,18 @@ namespace sfx class ClassificationKeyCreator { private: - SfxClassificationPolicyType m_ePolicyType; + const SfxClassificationPolicyType m_ePolicyType; + const OUString m_sPolicy; sal_Int32 m_nTextNumber; OUString getPolicyKey() const { - return SfxClassificationHelper::policyTypeToString(m_ePolicyType); + return m_sPolicy; } public: ClassificationKeyCreator(SfxClassificationPolicyType ePolicyType) : m_ePolicyType(ePolicyType) + , m_sPolicy(SfxClassificationHelper::policyTypeToString(m_ePolicyType)) , m_nTextNumber(1) {} @@ -133,9 +135,7 @@ public: OUString makeNumberedMarkingTextKey() { - OUString sKey = makeMarkingTextKey() + ":" + OUString::number(m_nTextNumber); - m_nTextNumber++; - return sKey; + return makeMarkingTextKey() + ":" + OUString::number(m_nTextNumber++); } bool isMarkingTextKey(OUString const & aKey) const @@ -143,15 +143,24 @@ public: return aKey.startsWith(makeMarkingTextKey()); } - OUString makeCategoryKey() const + OUString makeCategoryNameKey() const { return getPolicyKey() + "BusinessAuthorizationCategory:Name"; } - bool isCategoryKey(OUString const & aKey) const + bool isCategoryNameKey(OUString const & aKey) const { - return aKey.startsWith(makeCategoryKey()) || - aKey.startsWith(getPolicyKey() + "BusinessAuthorizationCategory:Identifier"); + return aKey.startsWith(makeCategoryNameKey()); + } + + OUString makeCategoryIdentifierKey() const + { + return getPolicyKey() + "BusinessAuthorizationCategory:Identifier"; + } + + bool isCategoryIdentifierKey(OUString const & aKey) const + { + return aKey.startsWith(makeCategoryIdentifierKey()); } OUString makeMarkingKey() const |