accessibility/inc/pch/precompiled_acc.hxx | 2
basctl/inc/pch/precompiled_basctl.hxx | 2
chart2/inc/pch/precompiled_chartcontroller.hxx | 2
cppcanvas/inc/pch/precompiled_cppcanvas.hxx | 2
cui/inc/pch/precompiled_cui.hxx | 2
dbaccess/inc/pch/precompiled_dba.hxx | 2
dbaccess/inc/pch/precompiled_dbmm.hxx | 2
desktop/inc/pch/precompiled_sofficeapp.hxx | 2
drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx | 2
filter/source/graphicfilter/ieps/ieps.cxx | 2
filter/source/graphicfilter/itiff/itiff.cxx | 2
framework/inc/pch/precompiled_fwe.hxx | 2
framework/inc/pch/precompiled_fwk.hxx | 2
framework/inc/pch/precompiled_fwl.hxx | 2
include/svx/bmpmask.hxx | 2
include/vcl/animate/Animation.hxx | 62 --------
include/vcl/animate/AnimationBitmap.hxx | 83 +++++++++++
include/vcl/graph.hxx | 2
oox/inc/pch/precompiled_oox.hxx | 2
reportdesign/inc/pch/precompiled_rpt.hxx | 2
reportdesign/inc/pch/precompiled_rptui.hxx | 2
sc/inc/pch/precompiled_sc.hxx | 2
sc/inc/pch/precompiled_scfilt.hxx | 2
sd/inc/pch/precompiled_sdui.hxx | 2
slideshow/inc/pch/precompiled_slideshow.hxx | 2
slideshow/source/engine/shapes/gdimtftools.cxx | 2
solenv/clang-format/blacklist | 6
svx/inc/pch/precompiled_svxcore.hxx | 2
sw/inc/pch/precompiled_msword.hxx | 2
sw/inc/pch/precompiled_swui.hxx | 2
sw/inc/pch/precompiled_vbaswobj.hxx | 2
vbahelper/inc/pch/precompiled_msforms.hxx | 2
vcl/Library_vcl.mk | 3
vcl/inc/graphic/Manager.hxx | 2
vcl/inc/impanmvw.hxx | 2
vcl/source/animate/Animation.cxx | 33 ----
vcl/source/animate/AnimationBitmap.cxx | 54 +++++++
vcl/source/bitmap/bitmapfilter.cxx | 2
vcl/source/graphic/GraphicObject2.cxx | 2
39 files changed, 181 insertions(+), 126 deletions(-)
New commits:
commit 5c3ae69f03eee5deddcaa4673b4fbab062f6c66a
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Sat Apr 27 21:44:12 2019 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Sun Apr 28 04:14:22 2019 +0200
Separate AnimationBitmap from Animation.{hxx,cxx} source
Change-Id: I982a108b2241c049b595a13d6f39d24ef0266074
Reviewed-on: https://gerrit.libreoffice.org/71423
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/include/vcl/animate/Animation.hxx
b/include/vcl/animate/Animation.hxx
index 8b40ddeaa71a..c642c3b283d9 100644
--- a/include/vcl/animate/Animation.hxx
+++ b/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
diff --git a/include/vcl/animate/AnimationBitmap.hxx
b/include/vcl/animate/AnimationBitmap.hxx
new file mode 100644
index 000000000000..1a91e5257b5b
--- /dev/null
+++ b/include/vcl/animate/AnimationBitmap.hxx
@@ -0,0 +1,83 @@
+/* -*- 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: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index f5a19345265e..f3b493d59d04 100644
--- a/solenv/clang-format/blacklist
+++ b/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
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index b66da1f8a071..962171879a0b 100644
--- a/vcl/Library_vcl.mk
+++ b/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 \
diff --git a/vcl/source/animate/Animation.cxx b/vcl/source/animate/Animation.cxx
index 3e3f20b551b0..54582eaf40ff 100644
--- a/vcl/source/animate/Animation.cxx
+++ b/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 ),
diff --git a/vcl/source/animate/AnimationBitmap.cxx
b/vcl/source/animate/AnimationBitmap.cxx
new file mode 100644
index 000000000000..c1d3e15bf09e
--- /dev/null
+++ b/vcl/source/animate/AnimationBitmap.cxx
@@ -0,0 +1,54 @@
+/* -*- 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: */
commit 18651dbc32a2d58191c81d738a765a1c83546e12
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Sat Apr 27 14:20:10 2019 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Sun Apr 28 04:14:09 2019 +0200
rename animate.hxx to animate/Animation.hxx, more changes follow
This is the first step of refactoring Animation where it is needed
to separate AnimationBitmap(s) from the Animation class, which
is also responsible for displaying of animation.
General idea is to make Graphic work only with AnimationBitmaps,
which can be freely be swapped out and in, make copies - all
transparantly from the actually displaying them and possibly it
will also remove the need to copy the animation objects.
Change-Id: If5d55ac1a5b26c3880d4f7602be57742b086f9da
Reviewed-on: https://gerrit.libreoffice.org/71406
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/accessibility/inc/pch/precompiled_acc.hxx
b/accessibility/inc/pch/precompiled_acc.hxx
index bfcd9876a129..1b1987ca5d8b 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -103,7 +103,7 @@
#include <vcl/NotebookbarContextControl.hxx>
#include <vcl/accel.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
diff --git a/basctl/inc/pch/precompiled_basctl.hxx
b/basctl/inc/pch/precompiled_basctl.hxx
index 2bce4900e2d7..df2e158ef096 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -114,7 +114,7 @@
#include <vcl/NotebookbarContextControl.hxx>
#include <vcl/accel.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx
b/chart2/inc/pch/precompiled_chartcontroller.hxx
index d74343b59568..3e97c8ca8474 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -107,7 +107,7 @@
#include <vcl/IContext.hxx>
#include <vcl/NotebookbarContextControl.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
index 491ee18fb1c7..6b41750c2ba3 100644
--- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
+++ b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
@@ -81,7 +81,7 @@
#include <sal/types.h>
#include <sal/typesizes.h>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/cairo.hxx>
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index 260b3a3350b9..d3e078be0c84 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -113,7 +113,7 @@
#include <vcl/EnumContext.hxx>
#include <vcl/NotebookbarContextControl.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
diff --git a/dbaccess/inc/pch/precompiled_dba.hxx
b/dbaccess/inc/pch/precompiled_dba.hxx
index 9e39d3b10338..4b88a4c30ded 100644
--- a/dbaccess/inc/pch/precompiled_dba.hxx
+++ b/dbaccess/inc/pch/precompiled_dba.hxx
@@ -103,7 +103,7 @@
#include <salhelper/singletonref.hxx>
#include <salhelper/thread.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/checksum.hxx>
diff --git a/dbaccess/inc/pch/precompiled_dbmm.hxx
b/dbaccess/inc/pch/precompiled_dbmm.hxx
index dc580df57f57..398c0b8dd853 100644
--- a/dbaccess/inc/pch/precompiled_dbmm.hxx
+++ b/dbaccess/inc/pch/precompiled_dbmm.hxx
@@ -90,7 +90,7 @@
#include <sal/typesizes.h>
#include <vcl/accel.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/cairo.hxx>
diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx
b/desktop/inc/pch/precompiled_sofficeapp.hxx
index ac170ca3b966..ccc4286c8dcc 100644
--- a/desktop/inc/pch/precompiled_sofficeapp.hxx
+++ b/desktop/inc/pch/precompiled_sofficeapp.hxx
@@ -111,7 +111,7 @@
#include <vcl/NotebookbarContextControl.hxx>
#include <vcl/accel.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index bdedee85417b..5ad8ad359c0c 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -36,7 +36,7 @@
// helper class for animated graphics
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/graph.hxx>
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx
b/filter/source/graphicfilter/ieps/ieps.cxx
index 3092bd51155c..c4e43e0fc7f2 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -22,7 +22,7 @@
#include <vcl/svapp.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/window.hxx>
#include <vcl/graph.hxx>
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx
b/filter/source/graphicfilter/itiff/itiff.cxx
index 85dc9d297265..956efdbb4f6c 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -25,7 +25,7 @@
#include <vcl/FilterConfigItem.hxx>
#include <vcl/graph.hxx>
#include <vcl/BitmapTools.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <tools/fract.hxx>
#include <tools/stream.hxx>
#include "lzwdecom.hxx"
diff --git a/framework/inc/pch/precompiled_fwe.hxx
b/framework/inc/pch/precompiled_fwe.hxx
index 7cdb1caee827..fcba92bc88ad 100644
--- a/framework/inc/pch/precompiled_fwe.hxx
+++ b/framework/inc/pch/precompiled_fwe.hxx
@@ -97,7 +97,7 @@
#include <vcl/EnumContext.hxx>
#include <vcl/accel.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/cairo.hxx>
diff --git a/framework/inc/pch/precompiled_fwk.hxx
b/framework/inc/pch/precompiled_fwk.hxx
index bee2b17a6a84..8c869f020b7b 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -106,7 +106,7 @@
#include <salhelper/singletonref.hxx>
#include <salhelper/thread.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/cairo.hxx>
diff --git a/framework/inc/pch/precompiled_fwl.hxx
b/framework/inc/pch/precompiled_fwl.hxx
index 1fa07d4c6f70..ca170528d9b2 100644
--- a/framework/inc/pch/precompiled_fwl.hxx
+++ b/framework/inc/pch/precompiled_fwl.hxx
@@ -109,7 +109,7 @@
#include <vcl/EnumContext.hxx>
#include <vcl/NotebookbarContextControl.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 3c7387276835..6020133cd1e7 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -26,7 +26,7 @@
#include <svl/poolitem.hxx>
#include <svx/svxdllapi.h>
#include <tools/color.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/gdimtf.hxx>
diff --git a/include/vcl/animate.hxx b/include/vcl/animate/Animation.hxx
similarity index 98%
rename from include/vcl/animate.hxx
rename to include/vcl/animate/Animation.hxx
index 98d1bb8a3b61..8b40ddeaa71a 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate/Animation.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_ANIMATE_HXX
-#define INCLUDED_VCL_ANIMATE_HXX
+#ifndef INCLUDED_VCL_ANIMATE_ANIMATION_HXX
+#define INCLUDED_VCL_ANIMATE_ANIMATION_HXX
#include <vcl/dllapi.h>
#include <vcl/timer.hxx>
@@ -183,6 +183,6 @@ private:
};
-#endif // INCLUDED_VCL_ANIMATE_HXX
+#endif // INCLUDED_VCL_ANIMATE_ANIMATION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 3b3e280ebd8c..f44858c88085 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -25,7 +25,7 @@
#include <tools/solar.h>
#include <rtl/ustring.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/gfxlink.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <vcl/vectorgraphicdata.hxx>
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx
index 222e9663fca5..d65aa127e897 100644
--- a/oox/inc/pch/precompiled_oox.hxx
+++ b/oox/inc/pch/precompiled_oox.hxx
@@ -79,7 +79,7 @@
#include <sal/log.hxx>
#include <sal/saldllapi.h>
#include <sal/types.h>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/dllapi.h>
diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx
b/reportdesign/inc/pch/precompiled_rpt.hxx
index a19aa62d789d..2bb4eaefee66 100644
--- a/reportdesign/inc/pch/precompiled_rpt.hxx
+++ b/reportdesign/inc/pch/precompiled_rpt.hxx
@@ -111,7 +111,7 @@
#include <vcl/EnumContext.hxx>
#include <vcl/accel.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/cairo.hxx>
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx
b/reportdesign/inc/pch/precompiled_rptui.hxx
index 92e0fe824920..ef65b5741392 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -117,7 +117,7 @@
#include <vcl/NotebookbarContextControl.hxx>
#include <vcl/abstdlg.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 67f567be8246..383739b80643 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -118,7 +118,7 @@
#include <vcl/IContext.hxx>
#include <vcl/NotebookbarContextControl.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
diff --git a/sc/inc/pch/precompiled_scfilt.hxx
b/sc/inc/pch/precompiled_scfilt.hxx
index 296250160562..7bdab2f9da53 100644
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -89,7 +89,7 @@
#include <sal/types.h>
#include <salhelper/singletonref.hxx>
#include <salhelper/thread.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/checksum.hxx>
diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index 1a323669d41d..41a9a2dff3e2 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -115,7 +115,7 @@
#include <vcl/NotebookbarContextControl.hxx>
#include <vcl/accel.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx
b/slideshow/inc/pch/precompiled_slideshow.hxx
index e12d6dcafa9f..564dc175ce26 100644
--- a/slideshow/inc/pch/precompiled_slideshow.hxx
+++ b/slideshow/inc/pch/precompiled_slideshow.hxx
@@ -101,7 +101,7 @@
#include <vcl/NotebookbarContextControl.hxx>
#include <vcl/accel.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx
b/slideshow/source/engine/shapes/gdimtftools.cxx
index 3221a1069931..ef9f4df82aee 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -40,7 +40,7 @@
#include <vcl/metaact.hxx>
#include <vcl/virdev.hxx>
#include <vcl/gdimtf.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/graph.hxx>
#include <unotools/streamwrap.hxx>
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 096cbea75ecc..f5a19345265e 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7809,7 +7809,7 @@ include/vcl/accessiblefactory.hxx
include/vcl/accessibletable.hxx
include/vcl/accessibletableprovider.hxx
include/vcl/alpha.hxx
-include/vcl/animate.hxx
+include/vcl/animate/Animation.hxx
include/vcl/bitmap.hxx
include/vcl/bitmapaccess.hxx
include/vcl/bitmapex.hxx
@@ -17756,6 +17756,7 @@ vcl/quartz/salgdicommon.cxx
vcl/quartz/salgdiutils.cxx
vcl/quartz/salvd.cxx
vcl/quartz/utils.cxx
+vcl/source/animate/Animation.cxx
vcl/source/app/ITiledRenderable.cxx
vcl/source/app/IconThemeInfo.cxx
vcl/source/app/IconThemeScanner.cxx
@@ -17892,7 +17893,6 @@ vcl/source/fontsubset/xlat.hxx
vcl/source/gdi/CommonSalLayout.cxx
vcl/source/gdi/VerticalOrientationData.cxx
vcl/source/gdi/alpha.cxx
-vcl/source/gdi/animate.cxx
vcl/source/gdi/bitmap3.cxx
vcl/source/gdi/bitmapex.cxx
vcl/source/gdi/bmpacc.cxx
diff --git a/svx/inc/pch/precompiled_svxcore.hxx
b/svx/inc/pch/precompiled_svxcore.hxx
index 2532dc732f66..f69e7facbdf4 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -106,7 +106,7 @@
#include <vcl/EnumContext.hxx>
#include <vcl/NotebookbarContextControl.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapaccess.hxx>
#include <vcl/bitmapex.hxx>
diff --git a/sw/inc/pch/precompiled_msword.hxx
b/sw/inc/pch/precompiled_msword.hxx
index 8635a2062a7d..b2567272dddf 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -115,7 +115,7 @@
#include <sal/typesizes.h>
#include <vcl/accel.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/cairo.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index f78a904d287d..cf3f92c8050b 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -120,7 +120,7 @@
#include <vcl/NotebookbarContextControl.hxx>
#include <vcl/accel.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx
b/sw/inc/pch/precompiled_vbaswobj.hxx
index 14c103107a75..c7a23a64cc66 100644
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -121,7 +121,7 @@
#include <vcl/NotebookbarContextControl.hxx>
#include <vcl/accel.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
diff --git a/vbahelper/inc/pch/precompiled_msforms.hxx
b/vbahelper/inc/pch/precompiled_msforms.hxx
index 36752910cc83..bcb826e7a892 100644
--- a/vbahelper/inc/pch/precompiled_msforms.hxx
+++ b/vbahelper/inc/pch/precompiled_msforms.hxx
@@ -93,7 +93,7 @@
#include <sal/typesizes.h>
#include <vcl/accel.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/cairo.hxx>
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 1ebdafdf6b18..b66da1f8a071 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -115,6 +115,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
endif
$(eval $(call gb_Library_add_exception_objects,vcl,\
+ vcl/source/animate/Animation \
vcl/source/window/errinf \
vcl/source/window/settings \
vcl/source/window/paint \
@@ -248,7 +249,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/treelist/svlbitm \
vcl/source/treelist/uiobject \
vcl/source/gdi/alpha \
- vcl/source/gdi/animate \
vcl/source/gdi/bitmap3 \
vcl/source/gdi/bitmapex \
vcl/source/gdi/bmpacc2 \
diff --git a/vcl/inc/graphic/Manager.hxx b/vcl/inc/graphic/Manager.hxx
index 1f897ecf7146..d6c0d718f8af 100644
--- a/vcl/inc/graphic/Manager.hxx
+++ b/vcl/inc/graphic/Manager.hxx
@@ -13,7 +13,7 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/vectorgraphicdata.hxx>
#include <vcl/metaact.hxx>
#include <vcl/timer.hxx>
diff --git a/vcl/inc/impanmvw.hxx b/vcl/inc/impanmvw.hxx
index b8164f60933d..95aafb1001a4 100644
--- a/vcl/inc/impanmvw.hxx
+++ b/vcl/inc/impanmvw.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_SOURCE_GDI_IMPANMVW_HXX
#define INCLUDED_VCL_SOURCE_GDI_IMPANMVW_HXX
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/vclptr.hxx>
class Animation;
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/animate/Animation.cxx
similarity index 99%
rename from vcl/source/gdi/animate.cxx
rename to vcl/source/animate/Animation.cxx
index 25eceb595f39..3e3f20b551b0 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/animate/Animation.cxx
@@ -24,7 +24,7 @@
#include <rtl/crc.h>
#include <sal/log.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/virdev.hxx>
#include <vcl/window.hxx>
#include <vcl/dibtools.hxx>
diff --git a/vcl/source/bitmap/bitmapfilter.cxx
b/vcl/source/bitmap/bitmapfilter.cxx
index b28573cf3906..347cfd069a6a 100644
--- a/vcl/source/bitmap/bitmapfilter.cxx
+++ b/vcl/source/bitmap/bitmapfilter.cxx
@@ -9,7 +9,7 @@
*/
#include <vcl/BitmapFilter.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <algorithm>
#include <sal/log.hxx>
diff --git a/vcl/source/graphic/GraphicObject2.cxx
b/vcl/source/graphic/GraphicObject2.cxx
index 7349e8b25c63..bfb31740def7 100644
--- a/vcl/source/graphic/GraphicObject2.cxx
+++ b/vcl/source/graphic/GraphicObject2.cxx
@@ -28,7 +28,7 @@
#include <vcl/gdimtf.hxx>
#include <vcl/metaact.hxx>
#include <vcl/metric.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/alpha.hxx>
#include <vcl/virdev.hxx>
#include <vcl/GraphicObject.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
