Separate AnimationBitmap from Animation.{hxx,cxx} source

Change-Id: I982a108b2241c049b595a13d6f39d24ef0266074
Reviewed-on: https://gerrit.libreoffice.org/71423
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

include/vcl/animate/Animation.hxx

@@ -22,64 +22,10 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/timer.hxx>
-#include <vcl/bitmapex.hxx>
+#include <vcl/animate/AnimationBitmap.hxx>
 
 #define ANIMATION_TIMEOUT_ON_CLICK 2147483647L
 
-enum class Disposal
-{
-    Not,
-    Back,
-    Previous
-};
-
-struct VCL_DLLPUBLIC AnimationBitmap
-{
-    BitmapEx        aBmpEx;
-    Point           aPosPix;
-    Size            aSizePix;
-    long            nWait;
-    Disposal        eDisposal;
-    bool            bUserInput;
-
-                    AnimationBitmap()
-                        : nWait(0)
-                        , eDisposal(Disposal::Not)
-                        , bUserInput(false)
-                    {}
-
-                    AnimationBitmap(
-                        const BitmapEx& rBmpEx,
-                        const Point& rPosPix,
-                        const Size& rSizePix,
-                        long _nWait = 0,
-                        Disposal _eDisposal = Disposal::Not
-                    ) :
-                        aBmpEx      ( rBmpEx ),
-                        aPosPix     ( rPosPix ),
-                        aSizePix    ( rSizePix ),
-                        nWait       ( _nWait ),
-                        eDisposal   ( _eDisposal ),
-                        bUserInput  ( false )
-                    {}
-
-    bool            operator==( const AnimationBitmap& rAnimBmp ) const
-                        {
-                            return( rAnimBmp.aBmpEx == aBmpEx &&
-                                    rAnimBmp.aPosPix == aPosPix &&
-                                    rAnimBmp.aSizePix == aSizePix &&
-                                    rAnimBmp.nWait == nWait &&
-                                    rAnimBmp.eDisposal == eDisposal &&
-                                    rAnimBmp.bUserInput == bUserInput );
-                        }
-
-    bool            operator!=( const AnimationBitmap& rAnimBmp ) const
-                        { return !( *this == rAnimBmp ); }
-
-
-    BitmapChecksum  GetChecksum() const;
-};
-
 class ImplAnimView;
 
 class VCL_DLLPUBLIC Animation

include/vcl/animate/AnimationBitmap.hxx

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_VCL_ANIMATE_ANIMATIONBITMAP_HXX
+#define INCLUDED_VCL_ANIMATE_ANIMATIONBITMAP_HXX
+
+#include <vcl/dllapi.h>
+#include <vcl/timer.hxx>
+#include <vcl/bitmapex.hxx>
+
+enum class Disposal
+{
+    Not,
+    Back,
+    Previous
+};
+
+struct VCL_DLLPUBLIC AnimationBitmap
+{
+    BitmapEx        aBmpEx;
+    Point           aPosPix;
+    Size            aSizePix;
+    long            nWait;
+    Disposal        eDisposal;
+    bool            bUserInput;
+
+                    AnimationBitmap()
+                        : nWait(0)
+                        , eDisposal(Disposal::Not)
+                        , bUserInput(false)
+                    {}
+
+                    AnimationBitmap(
+                        const BitmapEx& rBmpEx,
+                        const Point& rPosPix,
+                        const Size& rSizePix,
+                        long _nWait = 0,
+                        Disposal _eDisposal = Disposal::Not
+                    ) :
+                        aBmpEx      ( rBmpEx ),
+                        aPosPix     ( rPosPix ),
+                        aSizePix    ( rSizePix ),
+                        nWait       ( _nWait ),
+                        eDisposal   ( _eDisposal ),
+                        bUserInput  ( false )
+                    {}
+
+    bool            operator==( const AnimationBitmap& rAnimBmp ) const
+                        {
+                            return( rAnimBmp.aBmpEx == aBmpEx &&
+                                    rAnimBmp.aPosPix == aPosPix &&
+                                    rAnimBmp.aSizePix == aSizePix &&
+                                    rAnimBmp.nWait == nWait &&
+                                    rAnimBmp.eDisposal == eDisposal &&
+                                    rAnimBmp.bUserInput == bUserInput );
+                        }
+
+    bool            operator!=( const AnimationBitmap& rAnimBmp ) const
+                        { return !( *this == rAnimBmp ); }
+
+
+    BitmapChecksum  GetChecksum() const;
+};
+
+#endif // INCLUDED_VCL_ANIMATE_ANIMATIONBITMAP_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

solenv/clang-format/blacklist

@@ -7810,6 +7810,7 @@ include/vcl/accessibletable.hxx
 include/vcl/accessibletableprovider.hxx
 include/vcl/alpha.hxx
 include/vcl/animate/Animation.hxx
+include/vcl/animate/AnimationBitmap.hxx
 include/vcl/bitmap.hxx
 include/vcl/bitmapaccess.hxx
 include/vcl/bitmapex.hxx
@@ -17757,6 +17758,7 @@ vcl/quartz/salgdiutils.cxx
 vcl/quartz/salvd.cxx
 vcl/quartz/utils.cxx
 vcl/source/animate/Animation.cxx
+vcl/source/animate/AnimationBitmap.cxx
 vcl/source/app/ITiledRenderable.cxx
 vcl/source/app/IconThemeInfo.cxx
 vcl/source/app/IconThemeScanner.cxx

vcl/Library_vcl.mk

@@ -116,6 +116,7 @@ endif
 
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/animate/Animation \
+    vcl/source/animate/AnimationBitmap \
     vcl/source/window/errinf \
     vcl/source/window/settings \
     vcl/source/window/paint \

vcl/source/animate/Animation.cxx

@@ -19,9 +19,7 @@
 
 #include <sal/config.h>
 
-#include <o3tl/underlyingenumvalue.hxx>
 #include <tools/stream.hxx>
-#include <rtl/crc.h>
 #include <sal/log.hxx>
 
 #include <vcl/animate/Animation.hxx>
@@ -36,35 +34,6 @@
 
 sal_uLong Animation::mnAnimCount = 0;
 
-BitmapChecksum AnimationBitmap::GetChecksum() const
-{
-    BitmapChecksum  nCrc = aBmpEx.GetChecksum();
-    SVBT32      aBT32;
-
-    Int32ToSVBT32( aPosPix.X(), aBT32 );
-    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
-
-    Int32ToSVBT32( aPosPix.Y(), aBT32 );
-    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
-
-    Int32ToSVBT32( aSizePix.Width(), aBT32 );
-    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
-
-    Int32ToSVBT32( aSizePix.Height(), aBT32 );
-    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
-
-    Int32ToSVBT32( nWait, aBT32 );
-    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
-
-    UInt32ToSVBT32( o3tl::underlyingEnumValue(eDisposal), aBT32 );
-    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
-
-    UInt32ToSVBT32( sal_uInt32(bUserInput), aBT32 );
-    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
-
-    return nCrc;
-}
-
 Animation::Animation() :
     mnLoopCount         ( 0 ),
     mnLoops             ( 0 ),

vcl/source/animate/AnimationBitmap.cxx

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <sal/config.h>
+#include <o3tl/underlyingenumvalue.hxx>
+#include <rtl/crc.h>
+#include <vcl/animate/AnimationBitmap.hxx>
+
+BitmapChecksum AnimationBitmap::GetChecksum() const
+{
+    BitmapChecksum  nCrc = aBmpEx.GetChecksum();
+    SVBT32      aBT32;
+
+    Int32ToSVBT32( aPosPix.X(), aBT32 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
+
+    Int32ToSVBT32( aPosPix.Y(), aBT32 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
+
+    Int32ToSVBT32( aSizePix.Width(), aBT32 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
+
+    Int32ToSVBT32( aSizePix.Height(), aBT32 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
+
+    Int32ToSVBT32( nWait, aBT32 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
+
+    UInt32ToSVBT32( o3tl::underlyingEnumValue(eDisposal), aBT32 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
+
+    UInt32ToSVBT32( sal_uInt32(bUserInput), aBT32 );
+    nCrc = vcl_get_checksum( nCrc, aBT32, 4 );
+
+    return nCrc;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */