[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - connectivity/source

Caolán McNamara caolanm at redhat.com
Fri Nov 25 13:20:32 UTC 2016


 connectivity/source/drivers/dbase/dindexnode.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6c705826f506fe17b5191ee897b758843bcf5529
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 24 11:43:38 2016 +0000

    Related: coverity#1371267 copy ctor broken, nPagePos not copied
    
    initially operator= was removed by
    
    commit a0a919d2b541c415ad9b81d2ee91895bf106e9bb
    Date:   Fri Oct 3 10:39:28 2014 +0200
    
        remove SvRefBase::QueryDelete
    
    and then operator= was restored by
    
    commit faa6455995966e41653204779d055b885b27fc4c
    Date:   Fri Oct 10 12:02:32 2014 +0200
    
        add copy constructor for ONDXPagePtr class
    
        which I forgot in commit a0a919d2b541c415ad9b81d2ee91895bf106e9bb
        "remove SvRefBase::QueryDelete"
    
    but nPagePos was missed
    
    Change-Id: I6497934d4a199f5ea94cf2da840c164910e7a826
    (cherry picked from commit 8ceb8b2d141a249127822bd511e66dd855fb1e59)
    (cherry picked from commit 93154946452fdedad9b8b536ec3d9704a4707304)
    Reviewed-on: https://gerrit.libreoffice.org/31166
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 5f1501d..8bc2d58 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -839,6 +839,7 @@ ONDXPagePtr& ONDXPagePtr::operator=(ONDXPagePtr const & rOther)
     }
     ONDXPage * pOldObj = mpPage;
     mpPage = rOther.mpPage;
+    nPagePos = rOther.nPagePos;
     if (pOldObj != nullptr) {
         pOldObj->ReleaseRef();
     }


More information about the Libreoffice-commits mailing list