[Libreoffice-commits] core.git: include/oox oox/source sd/source

[Libreoffice Gerrit user]

 include/oox/ppt/pptfilterhelpers.hxx      |    4 ++--
 oox/source/ppt/commontimenodecontext.cxx  |    6 +++---
 sd/source/filter/eppt/pptexanimations.cxx |    2 +-
 sd/source/filter/ppt/pptinanimations.cxx  |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d321b7dd08e2e9138efe925b86a502a6740e89ef
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Tue Sep 18 12:33:00 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Sep 26 16:52:16 2018 +0200

    Fix preset_maping -> preset_mapping
    
    It passed "make check" on Linux
    
    Change-Id: I37c9af2a0687e292475d43a37b85e222c187f711
    Reviewed-on: https://gerrit.libreoffice.org/60690
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/oox/ppt/pptfilterhelpers.hxx b/include/oox/ppt/pptfilterhelpers.hxx
index 926d5a77fcf5..9fdd943d87b5 100644
--- a/include/oox/ppt/pptfilterhelpers.hxx
+++ b/include/oox/ppt/pptfilterhelpers.hxx
@@ -69,13 +69,13 @@ namespace oox { namespace ppt {
         static const convert_subtype* getList();
     };
 
-    struct OOX_DLLPUBLIC preset_maping
+    struct OOX_DLLPUBLIC preset_mapping
     {
         sal_Int32   mnPresetClass;
         sal_Int32   mnPresetId;
         const sal_Char* mpStrPresetId;
 
-        static const preset_maping* getList();
+        static const preset_mapping* getList();
     };
 
     OOX_DLLPUBLIC OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_Int32 nPresetSubType );
diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx
index cae060f4ca22..178962340467 100644
--- a/oox/source/ppt/commontimenodecontext.cxx
+++ b/oox/source/ppt/commontimenodecontext.cxx
@@ -79,10 +79,10 @@ const convert_subtype* convert_subtype::getList()
     return aList;
 }
 
-const preset_maping* preset_maping::getList()
+const preset_mapping* preset_mapping::getList()
 {
 
-    static const preset_maping aList[] =
+    static const preset_mapping aList[] =
     {
         { css::presentation::EffectPresetClass::ENTRANCE, 1    ,"ooo-entrance-appear" },
         { css::presentation::EffectPresetClass::ENTRANCE, 2    ,"ooo-entrance-fly-in" },
@@ -528,7 +528,7 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I
             if( attribs.hasAttribute( XML_presetID ) )
             {
                 sal_Int32 nPresetId = attribs.getInteger( XML_presetID, 0 );
-                const preset_maping* p = preset_maping::getList();
+                const preset_mapping* p = preset_mapping::getList();
                 while( p->mpStrPresetId && ((p->mnPresetClass != nEffectPresetClass) || (p->mnPresetId != nPresetId )) )
                     p++;
 
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index f0211dd9c728..4d3d2cf50535 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -924,7 +924,7 @@ sal_uInt32 AnimationExporter::GetPresetID( const OUString& rPreset, sal_uInt32 n
     }
     else
     {
-        const oox::ppt::preset_maping* p = oox::ppt::preset_maping::getList();
+        const oox::ppt::preset_mapping* p = oox::ppt::preset_mapping::getList();
     while( p->mpStrPresetId && ((p->mnPresetClass != static_cast<sal_Int32>(nAPIPresetClass)) || !rPreset.equalsAscii( p->mpStrPresetId )) )
         p++;
 
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 5c600a3629f0..d40d7f7f9512 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -735,7 +735,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode > const & xNode, con
             aUserData.realloc(nSize+1);
             aUserData[nSize].Name = "preset-id";
 
-            const oox::ppt::preset_maping* p = oox::ppt::preset_maping::getList();
+            const oox::ppt::preset_mapping* p = oox::ppt::preset_mapping::getList();
             while( p->mpStrPresetId && ((p->mnPresetClass != nEffectPresetClass) || (p->mnPresetId != nPresetId )) )
                 p++;