[Libreoffice-commits] core.git: include/sfx2

[Tomaž Vajngerl]

 include/sfx2/classificationhelper.hxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 35107521b799232bcba1e8d0ccad6005012d56dc
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Thu Nov 16 18:28:33 2017 +0900

    TSCP: simplify key names, prefix with "n" the enumeration keys
    
    Change-Id: I1796b379336812d71ffa7f9ad4ba5d79f6d53bbc
    Reviewed-on: https://gerrit.libreoffice.org/44844
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/include/sfx2/classificationhelper.hxx b/include/sfx2/classificationhelper.hxx
index a3f32788c2d9..f535cf4adae9 100644
--- a/include/sfx2/classificationhelper.hxx
+++ b/include/sfx2/classificationhelper.hxx
@@ -143,12 +143,12 @@ public:
 
     OUString makeTextKey() const
     {
-        return getPolicyKey() + "Marking:Text";
+        return getPolicyKey() + "Text";
     }
 
     OUString makeNumberedTextKey()
     {
-        return makeTextKey() + ":" + OUString::number(m_nTextNumber++);
+        return makeTextKey() + ":n" + OUString::number(m_nTextNumber++);
     }
 
     bool isMarkingTextKey(OUString const & aKey) const
@@ -178,12 +178,12 @@ public:
 
     OUString makeMarkingKey() const
     {
-        return getPolicyKey() + "Extension:Marking";
+        return getPolicyKey() + "Marking";
     }
 
     OUString makeNumberedMarkingKey()
     {
-        return makeMarkingKey() + ":" + OUString::number(m_nMarkingNumber++);
+        return makeMarkingKey() + ":n" + OUString::number(m_nMarkingNumber++);
     }
 
     bool isMarkingKey(OUString const & aKey) const
@@ -193,12 +193,12 @@ public:
 
     OUString makeIntellectualPropertyPartKey() const
     {
-        return getPolicyKey() + "Extension:IntellectualPropertyPart";
+        return getPolicyKey() + "IntellectualPropertyPart";
     }
 
     OUString makeNumberedIntellectualPropertyPartKey()
     {
-        return makeIntellectualPropertyPartKey() + ":" + OUString::number(m_nIPPartNumber++);
+        return makeIntellectualPropertyPartKey() + ":n" + OUString::number(m_nIPPartNumber++);
     }
 
     bool isIntellectualPropertyPartKey(OUString const & aKey) const
@@ -208,7 +208,7 @@ public:
 
     OUString makeFullTextualRepresentationKey() const
     {
-        return getPolicyKey() + "Extension:FullTexturalRepresentation";
+        return getPolicyKey() + "FullTexturalRepresentation";
     }
 
     /// Classification creation origin key