summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vcl/inc/animate/AnimationRenderer.hxx12
-rw-r--r--vcl/source/animate/Animation.cxx16
-rw-r--r--vcl/source/animate/AnimationRenderer.cxx10
3 files changed, 19 insertions, 19 deletions
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;