[Libreoffice-commits] core.git: animations/source

[Arkadiy Illarionov (via logerrit)]

 animations/source/animcore/animcore.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 6f31c63e35abef03e6f938bbddc8778b70a62d43
Author:     Arkadiy Illarionov <qar...@gmail.com>
AuthorDate: Sat Apr 6 13:36:35 2019 +0300
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Apr 6 18:55:10 2019 +0200

    clang-tidy modernize-avoid-c-arrays in animations
    
    Change-Id: I3dc1c0e63bd90735c20a65b1af25b243e5a5eee5
    Reviewed-on: https://gerrit.libreoffice.org/70341
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/animations/source/animcore/animcore.cxx 
b/animations/source/animcore/animcore.cxx
index 4dd4868e70e5..d5bcb0c21b14 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -57,6 +57,7 @@
 
 #include <osl/mutex.hxx>
 #include <sal/log.hxx>
+#include <array>
 #include <vector>
 #include <algorithm>
 #include <string.h>
@@ -287,7 +288,7 @@ private:
     const sal_Int16 mnNodeType;
 
     // for XTypeProvider
-    static Sequence< Type >* mpTypes[12];
+    static std::array<Sequence< Type >*, 12> mpTypes;
 
     // attributes for the XAnimationNode interface implementation
     Any maBegin, maDuration, maEnd, maEndSync, maRepeatCount, maRepeatDuration;
@@ -388,7 +389,7 @@ Any SAL_CALL TimeContainerEnumeration::nextElement()
 }
 
 
-Sequence< Type >* AnimationNode::mpTypes[] = { nullptr, nullptr, nullptr, 
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr };
+std::array<Sequence< Type >*, 12> AnimationNode::mpTypes = { nullptr, nullptr, 
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, 
nullptr, nullptr };
 
 AnimationNode::AnimationNode( sal_Int16 nNodeType )
 :   maChangeListener(maMutex),
@@ -418,7 +419,7 @@ AnimationNode::AnimationNode( sal_Int16 nNodeType )
     mnIterateType( css::presentation::ShapeAnimationSubType::AS_WHOLE ),
     mfIterateInterval(0.0)
 {
-    assert(nNodeType < int(SAL_N_ELEMENTS(mpTypes)));
+    assert(nNodeType < int(mpTypes.size()));
 }
 
 AnimationNode::AnimationNode( const AnimationNode& rNode )
@@ -696,7 +697,7 @@ void AnimationNode::initTypeProvider( sal_Int16 nNodeType ) 
throw()
 
     if(! mpTypes[nNodeType] )
     {
-        static const sal_Int32 type_numbers[] =
+        static constexpr std::array<sal_Int32, mpTypes.size()> type_numbers =
         {
             7, // CUSTOM
             9, // PAR
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits