[Libreoffice-commits] core.git: vcl/inc vcl/Library_vcl.mk vcl/source

[Julien Nabet (via logerrit)]

 vcl/Library_vcl.mk                                |    2 +-
 vcl/inc/font/OpenTypeFeatureDefinitionList.hxx    |    8 ++++----
 vcl/source/font/FeatureCollector.cxx              |    6 +++---
 vcl/source/font/OpenTypeFeatureDefinitionList.cxx |   14 +++++++-------
 4 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit d7a2c6eb94f2c1b8ae5c71457a032faf2d3ae643
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Mon Apr 20 16:54:13 2020 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Apr 20 18:34:57 2020 +0200

    Various typos in vcl OpenTypeFeature
    
    Name of files:
    vcl/inc/font/OpenTypeFeatureDefinitonList.hxx
    vcl/source/font/OpenTypeFeatureDefinitonList.cxx
    
    Class names:
    OpenTypeFeatureDefinitonListPrivate
    OpenTypeFeatureDefinitonList.hxx
    
    Change-Id: I5feb8ccc818b84b1b777b5b1e82c0a32a898aa72
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92581
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 50bdf3b3ca72..64812f920d47 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -438,7 +438,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/font/Feature \
     vcl/source/font/FeatureCollector \
     vcl/source/font/FeatureParser \
-    vcl/source/font/OpenTypeFeatureDefinitonList \
+    vcl/source/font/OpenTypeFeatureDefinitionList \
     vcl/source/font/PhysicalFontCollection \
     vcl/source/font/PhysicalFontFace \
     vcl/source/font/PhysicalFontFamily \
diff --git a/vcl/inc/font/OpenTypeFeatureDefinitonList.hxx b/vcl/inc/font/OpenTypeFeatureDefinitionList.hxx
similarity index 84%
rename from vcl/inc/font/OpenTypeFeatureDefinitonList.hxx
rename to vcl/inc/font/OpenTypeFeatureDefinitionList.hxx
index f587887427ed..8c318c92773f 100644
--- a/vcl/inc/font/OpenTypeFeatureDefinitonList.hxx
+++ b/vcl/inc/font/OpenTypeFeatureDefinitionList.hxx
@@ -20,7 +20,7 @@ namespace vcl
 {
 namespace font
 {
-class OpenTypeFeatureDefinitonListPrivate
+class OpenTypeFeatureDefinitionListPrivate
 {
 private:
     std::vector<FeatureDefinition> m_aFeatureDefinition;
@@ -33,13 +33,13 @@ private:
     static FeatureDefinition handleSpecialFeatureCode(sal_uInt32 nFeatureCode);
 
 public:
-    OpenTypeFeatureDefinitonListPrivate();
+    OpenTypeFeatureDefinitionListPrivate();
     FeatureDefinition getDefinition(sal_uInt32 nFeatureCode);
     bool isRequired(sal_uInt32 nFeatureCode);
 };
 
-class VCL_DLLPUBLIC OpenTypeFeatureDefinitonList
-    : public rtl::Static<OpenTypeFeatureDefinitonListPrivate, OpenTypeFeatureDefinitonList>
+class VCL_DLLPUBLIC OpenTypeFeatureDefinitionList
+    : public rtl::Static<OpenTypeFeatureDefinitionListPrivate, OpenTypeFeatureDefinitionList>
 {
 };
 
diff --git a/vcl/source/font/FeatureCollector.cxx b/vcl/source/font/FeatureCollector.cxx
index a606d629aa6c..4d875608206e 100644
--- a/vcl/source/font/FeatureCollector.cxx
+++ b/vcl/source/font/FeatureCollector.cxx
@@ -8,7 +8,7 @@
  */
 
 #include <font/FeatureCollector.hxx>
-#include <font/OpenTypeFeatureDefinitonList.hxx>
+#include <font/OpenTypeFeatureDefinitionList.hxx>
 
 #include <hb-ot.h>
 #include <hb-graphite2.h>
@@ -93,7 +93,7 @@ void FeatureCollector::collectForLanguage(hb_tag_t aTableTag, sal_uInt32 nScript
 
     for (hb_tag_t aFeatureTag : aFeatureTags)
     {
-        if (OpenTypeFeatureDefinitonList::get().isRequired(aFeatureTag))
+        if (OpenTypeFeatureDefinitionList::get().isRequired(aFeatureTag))
             continue;
 
         m_rFontFeatures.emplace_back();
@@ -101,7 +101,7 @@ void FeatureCollector::collectForLanguage(hb_tag_t aTableTag, sal_uInt32 nScript
         rFeature.m_aID = { aFeatureTag, aScriptTag, aLanguageTag };
 
         FeatureDefinition aDefinition
-            = OpenTypeFeatureDefinitonList::get().getDefinition(aFeatureTag);
+            = OpenTypeFeatureDefinitionList::get().getDefinition(aFeatureTag);
         if (aDefinition)
         {
             rFeature.m_aDefinition = aDefinition;
diff --git a/vcl/source/font/OpenTypeFeatureDefinitonList.cxx b/vcl/source/font/OpenTypeFeatureDefinitionList.cxx
similarity index 94%
rename from vcl/source/font/OpenTypeFeatureDefinitonList.cxx
rename to vcl/source/font/OpenTypeFeatureDefinitionList.cxx
index 6b9584bb73d8..9400594a324f 100644
--- a/vcl/source/font/OpenTypeFeatureDefinitonList.cxx
+++ b/vcl/source/font/OpenTypeFeatureDefinitionList.cxx
@@ -8,7 +8,7 @@
  *
  */
 
-#include <font/OpenTypeFeatureDefinitonList.hxx>
+#include <font/OpenTypeFeatureDefinitionList.hxx>
 #include <font/OpenTypeFeatureStrings.hrc>
 
 #include <rtl/character.hxx>
@@ -17,9 +17,9 @@
 
 namespace vcl::font
 {
-OpenTypeFeatureDefinitonListPrivate::OpenTypeFeatureDefinitonListPrivate() { init(); }
+OpenTypeFeatureDefinitionListPrivate::OpenTypeFeatureDefinitionListPrivate() { init(); }
 
-void OpenTypeFeatureDefinitonListPrivate::init()
+void OpenTypeFeatureDefinitionListPrivate::init()
 {
     m_aFeatureDefinition.assign({
         { featureCode("aalt"), STR_FONT_FEATURE_ID_AALT },
@@ -150,13 +150,13 @@ OUString getNumericLowerPart(sal_uInt32 nFeatureCode)
 
 } // end anonymous namespace
 
-bool OpenTypeFeatureDefinitonListPrivate::isSpecialFeatureCode(sal_uInt32 nFeatureCode)
+bool OpenTypeFeatureDefinitionListPrivate::isSpecialFeatureCode(sal_uInt32 nFeatureCode)
 {
     return isCharacterVariantCode(nFeatureCode) || isStylisticSetCode(nFeatureCode);
 }
 
 FeatureDefinition
-OpenTypeFeatureDefinitonListPrivate::handleSpecialFeatureCode(sal_uInt32 nFeatureCode)
+OpenTypeFeatureDefinitionListPrivate::handleSpecialFeatureCode(sal_uInt32 nFeatureCode)
 {
     FeatureDefinition aFeatureDefinition;
     OUString sNumericPart = getNumericLowerPart(nFeatureCode);
@@ -170,7 +170,7 @@ OpenTypeFeatureDefinitonListPrivate::handleSpecialFeatureCode(sal_uInt32 nFeatur
     return aFeatureDefinition;
 }
 
-FeatureDefinition OpenTypeFeatureDefinitonListPrivate::getDefinition(sal_uInt32 nFeatureCode)
+FeatureDefinition OpenTypeFeatureDefinitionListPrivate::getDefinition(sal_uInt32 nFeatureCode)
 {
     if (isSpecialFeatureCode(nFeatureCode))
     {
@@ -185,7 +185,7 @@ FeatureDefinition OpenTypeFeatureDefinitonListPrivate::getDefinition(sal_uInt32
     return FeatureDefinition();
 }
 
-bool OpenTypeFeatureDefinitonListPrivate::isRequired(sal_uInt32 nFeatureCode)
+bool OpenTypeFeatureDefinitionListPrivate::isRequired(sal_uInt32 nFeatureCode)
 {
     return std::find(m_aRequiredFeatures.begin(), m_aRequiredFeatures.end(), nFeatureCode)
            != m_aRequiredFeatures.end();