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

[Tomaž Vajngerl (via logerrit)]

 vcl/source/gdi/vectorgraphicdata.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ea3514e72961a6ee8b86413dbdbb69c61b368079
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sat Jan 2 00:18:25 2021 +0900
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Fri Jan 22 08:22:50 2021 +0100

    vcl: rename ambiguious aSequence variable to aPropertySequence
    
    There is maSequence already, which is totally different to this
    variable, so rename it to aPropertySequence, which should hint
    at what it is actually used for.
    
    Change-Id: Ia202c5bd69ed17ebe80ffb522538e03de2a83f3c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109601
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/source/gdi/vectorgraphicdata.cxx b/vcl/source/gdi/vectorgraphicdata.cxx
index 5a977191fef4..608251dc62c9 100644
--- a/vcl/source/gdi/vectorgraphicdata.cxx
+++ b/vcl/source/gdi/vectorgraphicdata.cxx
@@ -218,11 +218,11 @@ void VectorGraphicData::ensureSequenceAndRange()
             std::copy(maDataContainer.cbegin(), maDataContainer.cend(), aDataSequence.begin());
             const uno::Reference<io::XInputStream> xInputStream(new comphelper::SequenceInputStream(aDataSequence));
 
-            uno::Sequence< ::beans::PropertyValue > aSequence;
+            uno::Sequence< ::beans::PropertyValue > aPropertySequence;
 
             if (mpExternalHeader)
             {
-                aSequence = mpExternalHeader->getSequence();
+                aPropertySequence = mpExternalHeader->getSequence();
             }
 
             if (xInputStream.is())
@@ -235,12 +235,12 @@ void VectorGraphicData::ensureSequenceAndRange()
 
                 if (!mbEnableEMFPlus)
                 {
-                    auto aVector = comphelper::sequenceToContainer<std::vector<beans::PropertyValue>>(aSequence);
+                    auto aVector = comphelper::sequenceToContainer<std::vector<beans::PropertyValue>>(aPropertySequence);
                     aVector.push_back(comphelper::makePropertyValue("EMFPlusEnable", uno::makeAny(false)));
-                    aSequence = comphelper::containerToSequence(aVector);
+                    aPropertySequence = comphelper::containerToSequence(aVector);
                 }
 
-                maSequence = comphelper::sequenceToContainer<std::deque<css::uno::Reference< css::graphic::XPrimitive2D >>>(xEmfParser->getDecomposition(xInputStream, OUString(), aSequence));
+                maSequence = comphelper::sequenceToContainer<std::deque<css::uno::Reference< css::graphic::XPrimitive2D >>>(xEmfParser->getDecomposition(xInputStream, OUString(), aPropertySequence));
             }
 
             break;