[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - dbaccess/source

[Julien Nabet]

 dbaccess/source/ui/misc/WColumnSelect.cxx |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 71e822bed1131745bb66dc0798b3b8af61f0ec48
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Jan 9 22:51:09 2018 +0100

    tdf#113923: don't use twice a new column in table copy
    
    In the case where:
    1: we enabled the creation of a primary key
    2: we come back here from the "Back" button of the next page,
    we want to avoid to list the new column generated in the next page
    
    So we must check added columns in right panel must exist in the table
    
    Change-Id: I467007941b03811381a216c1ab3de8fe729f9b9b
    (cherry picked from commit c2bc2c4633e92349cac390c05d245d1a812986c4)
    Reviewed-on: https://gerrit.libreoffice.org/47708
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 127d6ffee4ef..8549cf16de41 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -148,13 +148,23 @@ void OWizColumnSelect::ActivatePage( )
 
     const ODatabaseExport::TColumnVector& rDestColumns = m_pParent->getDestVector();
 
+    // tdf#113923, the added columns must exist in the table
+    // in the case where:
+    // 1: we enabled the creation of a primary key
+    // 2: we come back here from the "Back" button of the next page,
+    // we want to avoid to list the new column generated in the next page
+    const ODatabaseExport::TColumns& rSrcColumns = m_pParent->getSourceColumns();
+
     ODatabaseExport::TColumnVector::const_iterator aIter = rDestColumns.begin();
     ODatabaseExport::TColumnVector::const_iterator aEnd = rDestColumns.end();
     for(;aIter != aEnd;++aIter)
     {
-        const sal_Int32 nPos = m_pNewColumnNames->InsertEntry((*aIter)->first);
-        m_pNewColumnNames->SetEntryData(nPos,new OFieldDescription(*((*aIter)->second)));
-        m_pOrgColumnNames->RemoveEntry((*aIter)->first);
+        if (rSrcColumns.find((*aIter)->first) != rSrcColumns.end())
+        {
+            const sal_Int32 nPos = m_pNewColumnNames->InsertEntry((*aIter)->first);
+            m_pNewColumnNames->SetEntryData(nPos,new OFieldDescription(*((*aIter)->second)));
+            m_pOrgColumnNames->RemoveEntry((*aIter)->first);
+        }
     }
     m_pParent->GetOKButton().Enable(m_pNewColumnNames->GetEntryCount() != 0);
     m_pParent->EnableNextButton(m_pNewColumnNames->GetEntryCount() && m_pParent->getOperation() != CopyTableOperation::AppendData);