| commit | 8a9ce8164aedda16e6732845adfdae03a7c810de | [log] |
|---|---|---|
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | Tue Sep 03 15:28:05 2019 +0200 |
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | Wed Sep 04 11:55:57 2019 +0200 |
| tree | 84af447937d46e44759ceec58dbf282c0731813f | |
| parent | b4f6db28dfa4a640ebbbe0854d0a1df546dd8766 [diff] |
Revert "tdf#127093, tdf#127092 Fix pasting autoincremented" This reverts commit fa177231cd20bf3c3f4bb9b50f6646da139c6766. Change-Id: Ia0c2d83c840c0ff8981b721766a6a1df810f971d Reviewed-on: https://gerrit.libreoffice.org/78559 Tested-by: Jenkins Reviewed-by: Tamás Bunth <btomi96@gmail.com> (cherry picked from commit d783017c1ccb4e62e99f26b42250ac4e15780cff) Reviewed-on: https://gerrit.libreoffice.org/78581 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index 7dbcbf3..397b527 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -61,9 +61,6 @@ namespace dbaui public: typedef std::map<OUString, OFieldDescription*, ::comphelper::UStringMixLess> TColumns; typedef std::vector<TColumns::const_iterator> TColumnVector; // first value is the position in the destination table. The second // value is the position of the column in the source table. typedef std::vector< std::pair<sal_Int32,sal_Int32> > TPositions; protected:
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index d8dd195..e7004aa 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1183,12 +1183,6 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou // otherwise we don't get the correct value when only the 2nd source column was selected continue; } else if( xMeta->isAutoIncrement( rColumnPos.second ) ) { // it is auto incremented. Let the DBMS deal with it. ++nSourceColumn; continue; } if ( ( nSourceColumn < 1 ) || ( nSourceColumn >= static_cast<sal_Int32>(aSourceColTypes.size()) ) ) { // ( we have to check here against 1 because the parameters are 1 based)