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

[Chris Sherlock (via logerrit)]

 vcl/inc/animate/AnimationRenderer.hxx    |   12 ++++++------
 vcl/source/animate/Animation.cxx         |   16 ++++++++--------
 vcl/source/animate/AnimationRenderer.cxx |   10 +++++-----
 3 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit c61d9e70b1bf4948408392217b9fbed9a2dc5ab1
Author:     Chris Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Fri Jul 1 17:28:21 2022 +1000
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Fri Aug 19 10:20:55 2022 +0200

    vcl: rename AnimationData fields to more sane names
    
    Change-Id: I5b3ae32b562f300fb33ba8daf5ef438268725a3a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/76431
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/vcl/inc/animate/AnimationRenderer.hxx 
b/vcl/inc/animate/AnimationRenderer.hxx
index 95de08014a21..bd4bdc61019e 100644
--- a/vcl/inc/animate/AnimationRenderer.hxx
+++ b/vcl/inc/animate/AnimationRenderer.hxx
@@ -30,12 +30,12 @@ struct AnimationBitmap;
 
 struct AnimationData
 {
-    Point           aStartOrg;
-    Size            aStartSize;
-    VclPtr<OutputDevice>   pOutDev;
-    void*           pRendererData;
-    tools::Long     nRendererId;
-    bool            mbIsPaused;
+    Point maOriginStartPt;
+    Size maStartSize;
+    VclPtr<OutputDevice> mpRenderContext;
+    void* mpRendererData;
+    tools::Long mnRendererId;
+    bool mbIsPaused;
 
     AnimationData();
 };
diff --git a/vcl/source/animate/Animation.cxx b/vcl/source/animate/Animation.cxx
index 831532d5977a..baa9c186023d 100644
--- a/vcl/source/animate/Animation.cxx
+++ b/vcl/source/animate/Animation.cxx
@@ -301,17 +301,17 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl, Timer*, void)
             for (auto& pDataItem : aDataItems)
             {
                 AnimationRenderer* pRenderer = nullptr;
-                if (!pDataItem->pRendererData)
+                if (!pDataItem->mpRendererData)
                 {
-                    pRenderer
-                        = new AnimationRenderer(this, pDataItem->pOutDev, 
pDataItem->aStartOrg,
-                                                pDataItem->aStartSize, 
pDataItem->nRendererId);
+                    pRenderer = new AnimationRenderer(
+                        this, pDataItem->mpRenderContext, 
pDataItem->maOriginStartPt,
+                        pDataItem->maStartSize, pDataItem->mnRendererId);
 
                     
maRenderers.push_back(std::unique_ptr<AnimationRenderer>(pRenderer));
                 }
                 else
                 {
-                    pRenderer = 
static_cast<AnimationRenderer*>(pDataItem->pRendererData);
+                    pRenderer = 
static_cast<AnimationRenderer*>(pDataItem->mpRendererData);
                 }
 
                 pRenderer->pause(pDataItem->mbIsPaused);
@@ -682,9 +682,9 @@ SvStream& ReadAnimation(SvStream& rIStm, Animation& 
rAnimation)
 }
 
 AnimationData::AnimationData()
-    : pOutDev(nullptr)
-    , pRendererData(nullptr)
-    , nRendererId(0)
+    : mpRenderContext(nullptr)
+    , mpRendererData(nullptr)
+    , mnRendererId(0)
     , mbIsPaused(false)
 {
 }
diff --git a/vcl/source/animate/AnimationRenderer.cxx 
b/vcl/source/animate/AnimationRenderer.cxx
index 9bb5efc38ae9..21b43c3c08d6 100644
--- a/vcl/source/animate/AnimationRenderer.cxx
+++ b/vcl/source/animate/AnimationRenderer.cxx
@@ -311,11 +311,11 @@ AnimationData* AnimationRenderer::createAnimationData() 
const
 {
     AnimationData* pDataItem = new AnimationData;
 
-    pDataItem->aStartOrg = maOriginPt;
-    pDataItem->aStartSize = maLogicalSize;
-    pDataItem->pOutDev = mpRenderContext;
-    pDataItem->pRendererData = const_cast<AnimationRenderer *>(this);
-    pDataItem->nRendererId = mnRendererId;
+    pDataItem->maOriginStartPt = maOriginPt;
+    pDataItem->maStartSize = maLogicalSize;
+    pDataItem->mpRenderContext = mpRenderContext;
+    pDataItem->mpRendererData = const_cast<AnimationRenderer *>(this);
+    pDataItem->mnRendererId = mnRendererId;
     pDataItem->mbIsPaused = mbIsPaused;
 
     return pDataItem;