dbaccess/source/ui/inc/DExport.hxx | 3 ---
dbaccess/source/ui/uno/copytablewizard.cxx | 6 ------
2 files changed, 9 deletions(-)
New commits:
commit 8a9ce8164aedda16e6732845adfdae03a7c810de
Author: Tamas Bunth <tamas.bu...@collabora.co.uk>
AuthorDate: Tue Sep 3 15:28:05 2019 +0200
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Wed Sep 4 11:55:57 2019 +0200
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 <btom...@gmail.com>
(cherry picked from commit d783017c1ccb4e62e99f26b42250ac4e15780cff)
Reviewed-on: https://gerrit.libreoffice.org/78581
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/dbaccess/source/ui/inc/DExport.hxx
b/dbaccess/source/ui/inc/DExport.hxx
index 7dbcbf31fc6a..397b527d6d7d 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 d8dd195701cf..e7004aa8d29b 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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
