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

[Noel Grandin]

 basic/source/sbx/sbxarray.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ba95e61314fb310575fe1dfd035234f4d6d7ca02
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Apr 7 11:21:49 2016 +0200

    fix bug in SbxArray::Merge
    
    bug was recently introduced by
    commit a5c232831395f8987a8395816c5a60105a52b6a0
    "BASIC: Store directly SbxVarEntry in SbxArray"
    
    bug was found by clang-tidy
    
    Change-Id: Ibcce6d6024ac60eb143cd873760586a7f6231858
    Reviewed-on: https://gerrit.libreoffice.org/23890
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index 11faaef..f78c376 100644
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -343,7 +343,7 @@ void SbxArray::Merge( SbxArray* p )
             {
                 // Take this element and clear the original.
                 rEntry2.mpVar = rEntry1.mpVar;
-                rEntry2.mpVar.Clear();
+                rEntry1.mpVar.Clear();
                 break;
             }
         }