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

[Libreoffice Gerrit user]

 oox/source/drawingml/shape.cxx |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit eada4adee8a32be021ee3031d07e0ccda7217e0d
Author:     Arkadiy Illarionov <qarkai at gmail.com>
AuthorDate: Sat Aug 25 10:09:41 2018 +0300
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Aug 28 09:01:09 2018 +0200

    tdf#39593 deduplicate code using existing function
    
    Change-Id: I437becdb0ed4840738d6c45d88cd3be2ff1243fb
    Reviewed-on: https://gerrit.libreoffice.org/59591
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index e58d54bf863c..2f7cd0722938 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -413,12 +413,7 @@ static inline void lcl_setPropertyValue( std::vector<beans::PropertyValue>& rPro
                            const OUString& rName,
                            const beans::PropertyValue& rPropertyValue )
 {
-    auto aIterator = std::find_if(
-        rPropVec.begin(), rPropVec.end(),
-        [rName]( const beans::PropertyValue& rValue ) { return rValue.Name == rName; } );
-
-    if (aIterator != rPropVec.end())
-        rPropVec.erase( aIterator );
+    lcl_resetPropertyValue( rPropVec, rName );
 
     rPropVec.push_back( rPropertyValue );
 }