Corrective and refactoring changes in drawinglayer module

Correct and simplify comparison logic
and use std::transform for vector assignment.

Change-Id: Idc92137db6d4648547a410f2cfd7e26edc797370
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152842
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>

2 files changed, 6 insertions, 25 deletions

diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 45536a53124b..f54b71417735 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -282,23 +282,10 @@ namespace drawinglayer::primitive2d
 
             const BorderLinePrimitive2D& rCompare = static_cast<const BorderLinePrimitive2D&>(rPrimitive);
 
-            if (getStart() == rCompare.getStart()
-                && getEnd() == rCompare.getEnd()
-                && getStrokeAttribute() == rCompare.getStrokeAttribute())
-            {
-                if (getBorderLines().size() == rCompare.getBorderLines().size())
-                {
-                    for (size_t a(0); a < getBorderLines().size(); a++)
-                    {
-                        if (!(getBorderLines()[a] == rCompare.getBorderLines()[a]))
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-
-            return false;
+            return (getStart() == rCompare.getStart()
+                    && getEnd() == rCompare.getEnd()
+                    && getStrokeAttribute() == rCompare.getStrokeAttribute()
+                    && getBorderLines() == rCompare.getBorderLines());
         }
 
         // provide unique ID
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index 955e6bd4f9ca..2b015fdad39b 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -485,10 +485,7 @@ namespace drawinglayer::primitive3d
 
                 Primitive3DContainer aRetval(aResultVector.size());
 
-                for(size_t a(0); a < aResultVector.size(); a++)
-                {
-                    aRetval[a] = Primitive3DReference(aResultVector[a]);
-                }
+                std::transform(aResultVector.cbegin(), aResultVector.cend(), aRetval.begin(), [](auto &rResult){return Primitive3DReference(rResult);});
 
                 return aRetval;
             }
@@ -707,10 +704,7 @@ using namespace com::sun::star;
             // prepare return value
             Primitive3DContainer aRetval(aResultVector.size());
 
-            for(size_t a(0); a < aResultVector.size(); a++)
-            {
-                aRetval[a] = Primitive3DReference(aResultVector[a]);
-            }
+            std::transform(aResultVector.cbegin(), aResultVector.cend(), aRetval.begin(), [](auto &rResult){return Primitive3DReference(rResult);});
 
             return aRetval;
         }