diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2020-04-22 19:52:19 +0200 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-04-27 06:57:07 +0200 |
commit | e294e29ab3bcd57c1d5d4f3fe372e26d5677a7ab (patch) | |
tree | 4eba4735a0023ab7b3c9cf09694cc00196cd7ce4 | |
parent | b50cbd7c7fd807af34d5140eaf94c57133148768 (diff) |
ImpGraphic: rename ImplCreateSwapInfo and simplify
ImplCreateSwapInfo changed to createSwapInfo.
Flatten the code body
Change-Id: I5865373d0b7f3cc717a9600bcf6fd198e8320e35
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92947
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
-rw-r--r-- | vcl/inc/impgraph.hxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/impgraph.cxx | 31 |
2 files changed, 17 insertions, 16 deletions
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index 24112ca03dbe..749a5b82a12e 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -116,7 +116,7 @@ private: return mpGraphicID->getIDString(); } - void ImplCreateSwapInfo(); + void createSwapInfo(); void ImplClearGraphics(); void ImplClear(); diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 1b0797889525..6cace1f79d79 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -384,18 +384,18 @@ const std::shared_ptr<VectorGraphicData>& ImpGraphic::getVectorGraphicData() con return maVectorGraphicData; } -void ImpGraphic::ImplCreateSwapInfo() +void ImpGraphic::createSwapInfo() { - if (!isSwappedOut()) - { - maSwapInfo.maPrefMapMode = ImplGetPrefMapMode(); - maSwapInfo.maPrefSize = ImplGetPrefSize(); - maSwapInfo.mbIsAnimated = ImplIsAnimated(); - maSwapInfo.mbIsEPS = ImplIsEPS(); - maSwapInfo.mbIsTransparent = ImplIsTransparent(); - maSwapInfo.mbIsAlpha = ImplIsAlpha(); - maSwapInfo.mnAnimationLoopCount = ImplGetAnimationLoopCount(); - } + if (isSwappedOut()) + return; + + maSwapInfo.maPrefMapMode = ImplGetPrefMapMode(); + maSwapInfo.maPrefSize = ImplGetPrefSize(); + maSwapInfo.mbIsAnimated = ImplIsAnimated(); + maSwapInfo.mbIsEPS = ImplIsEPS(); + maSwapInfo.mbIsTransparent = ImplIsTransparent(); + maSwapInfo.mbIsAlpha = ImplIsAlpha(); + maSwapInfo.mnAnimationLoopCount = ImplGetAnimationLoopCount(); } void ImpGraphic::ImplClearGraphics() @@ -1387,12 +1387,13 @@ bool ImpGraphic::swapOut() // Check if writing was successfull if (bResult) { - // We have swapped out, so can clean memory - mbSwapOut = true; - mpSwapFile = std::move(pSwapFile); - ImplCreateSwapInfo(); + // We have swapped out, so can clean memory and prepare swap info + createSwapInfo(); ImplClearGraphics(); + mpSwapFile = std::move(pSwapFile); + mbSwapOut = true; + // Signal to manager that we have swapped out vcl::graphic::Manager::get().swappedOut(this); } |